diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a70e132dc459..96727ee994e6 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -91,8 +91,10 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" echo "Please format them using the Nixpkgs-specific \`nixfmt\` by going to the Nixpkgs root directory, running \`nix-shell\`, then:" + echo echo "nixfmt ${unformattedFiles[*]@Q}" - echo "Make sure your branch is up to date with master, rebase if not." + echo + echo "Make sure your branch is up to date with master; rebase if not." echo "If you're having trouble, please ping @NixOS/nix-formatting" exit 1 fi diff --git a/ci/OWNERS b/ci/OWNERS index dd952ddeebb4..8547d650348a 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -60,10 +60,9 @@ /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus /pkgs/by-name/au/auto-patchelf @layus -/pkgs/pkgs-lib @infinisil + ## Format generators/serializers -/pkgs/pkgs-lib/formats/libconfig @h7x4 -/pkgs/pkgs-lib/formats/hocon @h7x4 +/pkgs/pkgs-lib @Stunkymonkey @h7x4 # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch diff --git a/doc/interoperability/openxr.md b/doc/interoperability/openxr.md new file mode 100644 index 000000000000..186b06d38c03 --- /dev/null +++ b/doc/interoperability/openxr.md @@ -0,0 +1,5 @@ +# OpenXR in NixOS + +OpenXR is a standard for eXtended Reality (XR) applications and drivers (providers). + +OpenXR runtime providers must ensure that the library path of the runtime's shared library can be loaded by Nix applications. If your OpenXR runtime provider runs in an FHSEnv, this means you may have to use `auto-patchelf` to link dependencies to the Nix store. diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 956d9fb754e9..ed68560d37fc 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -18,6 +18,9 @@ - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute. - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute. +- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus, +`tinycc.out` may now only provide the tcc and cross compilers binaries. + - The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs. ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations} diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 071358b994dd..b06a8ab93a70 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -135,7 +135,7 @@ Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is availa ``` #### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler} -On less powerful machines, it can be inconvenient to cross-compile a package only to find out that GCC has to be compiled from source, which could take up to several hours. Nixpkgs maintains a limited [cross-related jobset on Hydra](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk), which tests cross-compilation to various platforms from build platforms "x86\_64-darwin", "x86\_64-linux", and "aarch64-linux". See `pkgs/top-level/release-cross.nix` for the full list of target platforms and packages. For instance, the following invocation fetches the pre-built cross-compiled GCC for `armv6l-unknown-linux-gnueabihf` and builds GNU Hello from source. +On less powerful machines, it can be inconvenient to cross-compile a package only to find out that GCC has to be compiled from source, which could take up to several hours. Nixpkgs maintains a limited [cross-related jobset on Hydra](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk), which tests cross-compilation to various platforms from build platforms "x86\_64-linux", "aarch64-linux", and "aarch64-darwin". See `pkgs/top-level/release-cross.nix` for the full list of target platforms and packages. For instance, the following invocation fetches the pre-built cross-compiled GCC for `armv6l-unknown-linux-gnueabihf` and builds GNU Hello from source. ```ShellSession $ nix-build '' -A pkgsCross.raspberryPi.hello diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 3a98c7f7d4fd..853b56f3c510 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -75,17 +75,9 @@ stdenv.mkDerivation { } ``` -where the builder can do anything it wants, but typically starts with +where `stdenv` sets up the environment automatically (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can use `stdenv`’s generic builder: ```bash -source $stdenv/setup -``` - -to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can still use `stdenv`’s generic builder: - -```bash -source $stdenv/setup - buildPhase() { echo "... this is my custom build phase ..." gcc foo.c -o foo @@ -408,7 +400,7 @@ The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be us ##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} -The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets. +The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. Note that if instead, package `Z` has `nativeBuildInputs = [Y]`, then `X` will not be included at all. ##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} @@ -1276,7 +1268,7 @@ addEnvHooks "$hostOffset" myBashFunction The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time. -First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. +First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation`, even with custom builders. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. ### `move-docs.sh` {#move-docs.sh} @@ -1411,6 +1403,7 @@ these in the [Hooks Reference](#chap-hooks). ### Compiler and Linker wrapper hooks {#compiler-linker-wrapper-hooks} If the file `${cc}/nix-support/cc-wrapper-hook` exists, it will be run at the end of the [compiler wrapper](#cc-wrapper). +If the file `${binutils}/nix-support/ld-wrapper-hook` exists, it will be run at the end of the linker wrapper, before the linker runs. If the file `${binutils}/nix-support/post-link-hook` exists, it will be run at the end of the linker wrapper. These hooks allow a user to inject code into the wrappers. As an example, these hooks can be used to extract `extraBefore`, `params` and `extraAfter` which store all the command line arguments passed to the compiler and linker respectively. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91c563982d0a..8b1cbbb11037 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17079,6 +17079,12 @@ github = "jackyliu16"; githubId = 50787361; }; + one-d-wide = { + name = "Remy D. Farley"; + email = "one-d-wide@protonmail.com"; + github = "one-d-wide"; + githubId = 116499566; + }; onemoresuza = { name = "Coutinho de Souza"; email = "dev@onemoresuza.com"; @@ -17251,6 +17257,14 @@ githubId = 108072; name = "Slawomir Gonet"; }; + outfoxxed = { + name = "outfoxxed"; + email = "nixpkgs@outfoxxed.me"; + matrix = "@outfoxxed:outfoxxed.me"; + github = "outfoxxed"; + githubId = 83010835; + keys = [ { fingerprint = "0181 FF89 4F34 7FCC EB06 5710 4C88 A185 FB89 301E"; } ]; + }; ovlach = { email = "ondrej@vlach.xyz"; name = "Ondrej Vlach"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 49942e8e5f1b..339c4bb38c36 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -928,8 +928,6 @@ - `buildNimSbom` was added as an alternative to `buildNimPackage`. `buildNimSbom` uses [SBOMs](https://cyclonedx.org/) to generate packages whereas `buildNimPackage` uses a custom JSON lockfile format. -- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific 4.8 versions; those will continue to be maintained. - ## Detailed Migration Information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} @@ -938,16 +936,15 @@ The `sound` options have been largely removed, as they are unnecessary for most If you set `sound.enable` in your configuration: - If you are using Pulseaudio or PipeWire, simply remove that option - - If you are using ALSA as your only sound system (no sound server), set `hardware.alsa.enable = true` instead + - If you are not using an external sound server, and want volumes to be persisted across shutdowns, set `hardware.alsa.enablePersistence = true` instead If you set `sound.enableOSSEmulation` in your configuration: - Make sure it is still necessary, as very few applications actually use OSS - - If necessary, set `hardware.alsa.enableOSSEmulation = true` + - If necessary, set `boot.kernelModules = [ "snd_pcm_oss" ]` If you set `sound.extraConfig` in your configuration: - - If you are using a sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that - - If you are using ALSA as your only sound system, check if you can use the new structured ALSA options `hardware.alsa.defaultDevice`, `hardware.alsa.cardAliases`, `hardware.alsa.controls`, etc. - - Otherwise, move your configuration directly into `hardware.alsa.config` + - If you are using another sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that + - If you are not using an external sound server, set `environment.etc."asound.conf".text = yourExtraConfig` instead If you set `sound.mediaKeys` in your configuration: - Preferably switch to handling media keys in your desktop environment/compositor diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1fd054fe81ed..f514f46f543b 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -28,12 +28,12 @@ - `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type. - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. + - A `nixos-rebuild build-image` sub-command has been added. + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. - It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). - ## New Modules {#sec-release-25.05-new-modules} @@ -52,6 +52,8 @@ - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). +- [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper) is an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. + - [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable) - [ytdl-sub](https://github.com/jmbannon/ytdl-sub), a tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. Available as [services.ytdl-sub](options.html#opt-services.ytdl-sub.instances). @@ -224,6 +226,8 @@ - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. +- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. + - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) @@ -374,6 +378,9 @@ - The paperless module now has an option for regular automatic export of documents data using the integrated document exporter. +- New options for the declarative configuration of the user space part of ALSA have been introduced under [hardware.alsa](options.html#opt-hardware.alsa.enable), including setting the default capture and playback device, defining sound card aliases and volume controls. + Note: these are intended for users not running a sound server like PulseAudio or PipeWire, but having ALSA as their only sound system. + - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added. Example: diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 648f2f774ddf..cc9a667ccccd 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -1,115 +1,117 @@ -/* Technical details +/* + Technical details -`make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. + `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. -It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library. + It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library. -The Nix-store only image only need to run LKL tools to produce an image and will never spawn a virtual machine, whereas full images will always require a virtual machine, but also use LKL. + The Nix-store only image only need to run LKL tools to produce an image and will never spawn a virtual machine, whereas full images will always require a virtual machine, but also use LKL. -### Image preparation phase + ### Image preparation phase -Image preparation phase will produce the initial image layout in a folder: + Image preparation phase will produce the initial image layout in a folder: -- devise a root folder based on `$PWD` -- prepare the contents by copying and restoring ACLs in this root folder -- load in the Nix store database all additional paths computed by `pkgs.closureInfo` in a temporary Nix store -- run `nixos-install` in a temporary folder -- transfer from the temporary store the additional paths registered to the installed NixOS -- compute the size of the disk image based on the apparent size of the root folder -- partition the disk image using the corresponding script according to the partition table type -- format the partitions if needed -- use `cptofs` (LKL tool) to copy the root folder inside the disk image + - devise a root folder based on `$PWD` + - prepare the contents by copying and restoring ACLs in this root folder + - load in the Nix store database all additional paths computed by `pkgs.closureInfo` in a temporary Nix store + - run `nixos-install` in a temporary folder + - transfer from the temporary store the additional paths registered to the installed NixOS + - compute the size of the disk image based on the apparent size of the root folder + - partition the disk image using the corresponding script according to the partition table type + - format the partitions if needed + - use `cptofs` (LKL tool) to copy the root folder inside the disk image -At this step, the disk image already contains the Nix store, it now only needs to be converted to the desired format to be used. + At this step, the disk image already contains the Nix store, it now only needs to be converted to the desired format to be used. -### Image conversion phase + ### Image conversion phase -Using `qemu-img`, the disk image is converted from a raw format to the desired format: qcow2(-compressed), vdi, vpc. + Using `qemu-img`, the disk image is converted from a raw format to the desired format: qcow2(-compressed), vdi, vpc. -### Image Partitioning + ### Image Partitioning -#### `none` + #### `none` -No partition table layout is written. The image is a bare filesystem image. + No partition table layout is written. The image is a bare filesystem image. -#### `legacy` + #### `legacy` -The image is partitioned using MBR. There is one primary ext4 partition starting at 1 MiB that fills the rest of the disk image. + The image is partitioned using MBR. There is one primary ext4 partition starting at 1 MiB that fills the rest of the disk image. -This partition layout is unsuitable for UEFI. + This partition layout is unsuitable for UEFI. -#### `legacy+gpt` + #### `legacy+gpt` -This partition table type uses GPT and: + This partition table type uses GPT and: -- create a "no filesystem" partition from 1MiB to 2MiB ; -- set `bios_grub` flag on this "no filesystem" partition, which marks it as a [GRUB BIOS partition](https://www.gnu.org/software/parted/manual/html_node/set.html) ; -- create a primary ext4 partition starting at 2MiB and extending to the full disk image ; -- perform optimal alignments checks on each partition + - create a "no filesystem" partition from 1MiB to 2MiB ; + - set `bios_grub` flag on this "no filesystem" partition, which marks it as a [GRUB BIOS partition](https://www.gnu.org/software/parted/manual/html_node/set.html) ; + - create a primary ext4 partition starting at 2MiB and extending to the full disk image ; + - perform optimal alignments checks on each partition -This partition layout is unsuitable for UEFI boot, because it has no ESP (EFI System Partition) partition. It can work with CSM (Compatibility Support Module) which emulates legacy (BIOS) boot for UEFI. + This partition layout is unsuitable for UEFI boot, because it has no ESP (EFI System Partition) partition. It can work with CSM (Compatibility Support Module) which emulates legacy (BIOS) boot for UEFI. -#### `efi` + #### `efi` -This partition table type uses GPT and: + This partition table type uses GPT and: -- creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; -- creates an primary ext4 partition starting after the boot partition and extending to the full disk image + - creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; + - creates an primary ext4 partition starting after the boot partition and extending to the full disk image -#### `efixbootldr` + #### `efixbootldr` -This partition table type uses GPT and: + This partition table type uses GPT and: -- creates an FAT32 ESP partition from 8MiB to 100MiB, set it bootable ; -- creates an FAT32 BOOT partition from 100MiB to specified `bootSize` parameter (256MiB by default), set `bls_boot` flag ; -- creates an primary ext4 partition starting after the boot partition and extending to the full disk image + - creates an FAT32 ESP partition from 8MiB to 100MiB, set it bootable ; + - creates an FAT32 BOOT partition from 100MiB to specified `bootSize` parameter (256MiB by default), set `bls_boot` flag ; + - creates an primary ext4 partition starting after the boot partition and extending to the full disk image -#### `hybrid` + #### `hybrid` -This partition table type uses GPT and: + This partition table type uses GPT and: -- creates a "no filesystem" partition from 0 to 1MiB, set `bios_grub` flag on it ; -- creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; -- creates a primary ext4 partition starting after the boot one and extending to the full disk image + - creates a "no filesystem" partition from 0 to 1MiB, set `bios_grub` flag on it ; + - creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; + - creates a primary ext4 partition starting after the boot one and extending to the full disk image -This partition could be booted by a BIOS able to understand GPT layouts and recognizing the MBR at the start. + This partition could be booted by a BIOS able to understand GPT layouts and recognizing the MBR at the start. -### How to run determinism analysis on results? + ### How to run determinism analysis on results? -Build your derivation with `--check` to rebuild it and verify it is the same. + Build your derivation with `--check` to rebuild it and verify it is the same. -If it fails, you will be left with two folders with one having `.check`. + If it fails, you will be left with two folders with one having `.check`. -You can use `diffoscope` to see the differences between the folders. + You can use `diffoscope` to see the differences between the folders. -However, `diffoscope` is currently not able to diff two QCOW2 filesystems, thus, it is advised to use raw format. + However, `diffoscope` is currently not able to diff two QCOW2 filesystems, thus, it is advised to use raw format. -Even if you use raw disks, `diffoscope` cannot diff the partition table and partitions recursively. + Even if you use raw disks, `diffoscope` cannot diff the partition table and partitions recursively. -To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$image-p$i.raw skip=$start count=$sectors` for each `(start, sectors)` listed in the `fdisk` output. Now, you will have each partition as a separate file and you can compare them in pairs. + To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$image-p$i.raw skip=$start count=$sectors` for each `(start, sectors)` listed in the `fdisk` output. Now, you will have each partition as a separate file and you can compare them in pairs. */ -{ pkgs -, lib +{ + pkgs, + lib, -, # The NixOS configuration to be installed onto the disk image. - config + # The NixOS configuration to be installed onto the disk image. + config, -, # The size of the disk, in megabytes. + # The size of the disk, in megabytes. # if "auto" size is calculated based on the contents copied to it and # additionalSpace is taken into account. - diskSize ? "auto" + diskSize ? "auto", -, # additional disk space to be added to the image if diskSize "auto" + # additional disk space to be added to the image if diskSize "auto" # is used - additionalSpace ? "512M" + additionalSpace ? "512M", -, # size of the boot partition, is only used if partitionTableType is + # size of the boot partition, is only used if partitionTableType is # either "efi" or "hybrid" # This will be undersized slightly, as this is actually the offset of # the end of the partition. Generally it will be 1MiB smaller. - bootSize ? "256M" + bootSize ? "256M", -, # The files and directories to be placed in the target file system. + # The files and directories to be placed in the target file system. # This is a list of attribute sets {source, target, mode, user, group} where # `source' is the file system object (regular file or directory) to be # grafted in the file system at path `target', `mode' is a string containing @@ -117,54 +119,54 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag # user and group name that will be set as owner of the files. # `mode', `user', and `group' are optional. # When setting one of `user' or `group', the other needs to be set too. - contents ? [] + contents ? [ ], -, # Type of partition table to use; described in the `Image Partitioning` section above. - partitionTableType ? "legacy" + # Type of partition table to use; described in the `Image Partitioning` section above. + partitionTableType ? "legacy", -, # Whether to invoke `switch-to-configuration boot` during image creation - installBootLoader ? true + # Whether to invoke `switch-to-configuration boot` during image creation + installBootLoader ? true, -, # Whether to output have EFIVARS available in $out/efi-vars.fd and use it during disk creation - touchEFIVars ? false + # Whether to output have EFIVARS available in $out/efi-vars.fd and use it during disk creation + touchEFIVars ? false, -, # OVMF firmware derivation - OVMF ? pkgs.OVMF.fd + # OVMF firmware derivation + OVMF ? pkgs.OVMF.fd, -, # EFI firmware - efiFirmware ? OVMF.firmware + # EFI firmware + efiFirmware ? OVMF.firmware, -, # EFI variables - efiVariables ? OVMF.variables + # EFI variables + efiVariables ? OVMF.variables, -, # The root file system type. - fsType ? "ext4" + # The root file system type. + fsType ? "ext4", -, # Filesystem label - label ? if onlyNixStore then "nix-store" else "nixos" + # Filesystem label + label ? if onlyNixStore then "nix-store" else "nixos", -, # The initial NixOS configuration file to be copied to + # The initial NixOS configuration file to be copied to # /etc/nixos/configuration.nix. - configFile ? null + configFile ? null, -, # Shell code executed after the VM has finished. - postVM ? "" + # Shell code executed after the VM has finished. + postVM ? "", -, # Guest memory size - memSize ? 1024 + # Guest memory size + memSize ? 1024, -, # Copy the contents of the Nix store to the root of the image and + # Copy the contents of the Nix store to the root of the image and # skip further setup. Incompatible with `contents`, # `installBootLoader` and `configFile`. - onlyNixStore ? false + onlyNixStore ? false, -, name ? "nixos-disk-image" + name ? "nixos-disk-image", -, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. - format ? "raw" + # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. + format ? "raw", -, # Disk image filename, without any extensions (e.g. `image_1`). - baseName ? "nixos" + # Disk image filename, without any extensions (e.g. `image_1`). + baseName ? "nixos", # Whether to fix: # - GPT Disk Unique Identifier (diskGUID) @@ -174,139 +176,191 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag # BIOS/MBR support is "best effort" at the moment. # Boot partitions may not be deterministic. # Also, to fix last time checked of the ext4 partition if fsType = ext4. -, deterministic ? true + deterministic ? true, # GPT Partition Unique Identifier for root partition. -, rootGPUID ? "F222513B-DED1-49FA-B591-20CE86A2FE7F" + rootGPUID ? "F222513B-DED1-49FA-B591-20CE86A2FE7F", # When fsType = ext4, this is the root Filesystem Unique Identifier. # TODO: support other filesystems someday. -, rootFSUID ? (if fsType == "ext4" then rootGPUID else null) + rootFSUID ? (if fsType == "ext4" then rootGPUID else null), -, # Whether a nix channel based on the current source tree should be + # Whether a nix channel based on the current source tree should be # made available inside the image. Useful for interactive use of nix # utils, but changes the hash of the image when the sources are # updated. - copyChannel ? true + copyChannel ? true, -, # Additional store paths to copy to the image's store. - additionalPaths ? [] + # Additional store paths to copy to the image's store. + additionalPaths ? [ ], }: -assert (lib.assertOneOf "partitionTableType" partitionTableType [ "legacy" "legacy+gpt" "efi" "efixbootldr" "hybrid" "none" ]); -assert (lib.assertMsg (fsType == "ext4" && deterministic -> rootFSUID != null) "In deterministic mode with a ext4 partition, rootFSUID must be non-null, by default, it is equal to rootGPUID."); - # We use -E offset=X below, which is only supported by e2fsprogs -assert (lib.assertMsg (partitionTableType != "none" -> fsType == "ext4") "to produce a partition table, we need to use -E offset flag which is support only for fsType = ext4"); -assert (lib.assertMsg (touchEFIVars -> partitionTableType == "hybrid" || partitionTableType == "efi" || partitionTableType == "efixbootldr" || partitionTableType == "legacy+gpt") "EFI variables can be used only with a partition table of type: hybrid, efi, efixbootldr, or legacy+gpt."); - # If only Nix store image, then: contents must be empty, configFile must be unset, and we should no install bootloader. -assert (lib.assertMsg (onlyNixStore -> contents == [] && configFile == null && !installBootLoader) "In a only Nix store image, the contents must be empty, no configuration must be provided and no bootloader should be installed."); +assert ( + lib.assertOneOf "partitionTableType" partitionTableType [ + "legacy" + "legacy+gpt" + "efi" + "efixbootldr" + "hybrid" + "none" + ] +); +assert ( + lib.assertMsg (fsType == "ext4" && deterministic -> rootFSUID != null) + "In deterministic mode with a ext4 partition, rootFSUID must be non-null, by default, it is equal to rootGPUID." +); +# We use -E offset=X below, which is only supported by e2fsprogs +assert ( + lib.assertMsg (partitionTableType != "none" -> fsType == "ext4") + "to produce a partition table, we need to use -E offset flag which is support only for fsType = ext4" +); +assert ( + lib.assertMsg + ( + touchEFIVars + -> + partitionTableType == "hybrid" + || partitionTableType == "efi" + || partitionTableType == "efixbootldr" + || partitionTableType == "legacy+gpt" + ) + "EFI variables can be used only with a partition table of type: hybrid, efi, efixbootldr, or legacy+gpt." +); +# If only Nix store image, then: contents must be empty, configFile must be unset, and we should no install bootloader. +assert ( + lib.assertMsg (onlyNixStore -> contents == [ ] && configFile == null && !installBootLoader) + "In a only Nix store image, the contents must be empty, no configuration must be provided and no bootloader should be installed." +); # Either both or none of {user,group} need to be set -assert (lib.assertMsg (lib.all - (attrs: ((attrs.user or null) == null) - == ((attrs.group or null) == null)) - contents) "Contents of the disk image should set none of {user, group} or both at the same time."); +assert ( + lib.assertMsg (lib.all ( + attrs: ((attrs.user or null) == null) == ((attrs.group or null) == null) + ) contents) "Contents of the disk image should set none of {user, group} or both at the same time." +); -let format' = format; in let +let + format' = format; +in +let format = if format' == "qcow2-compressed" then "qcow2" else format'; compress = lib.optionalString (format' == "qcow2-compressed") "-c"; - filename = "${baseName}." + { - qcow2 = "qcow2"; - vdi = "vdi"; - vpc = "vhd"; - raw = "img"; - }.${format} or format; + filename = + "${baseName}." + + { + qcow2 = "qcow2"; + vdi = "vdi"; + vpc = "vhd"; + raw = "img"; + } + .${format} or format; - rootPartition = { # switch-case - legacy = "1"; - "legacy+gpt" = "2"; - efi = "2"; - efixbootldr = "3"; - hybrid = "3"; - }.${partitionTableType}; + rootPartition = + { + # switch-case + legacy = "1"; + "legacy+gpt" = "2"; + efi = "2"; + efixbootldr = "3"; + hybrid = "3"; + } + .${partitionTableType}; - partitionDiskScript = { # switch-case - legacy = '' - parted --script $diskImage -- \ - mklabel msdos \ - mkpart primary ext4 1MiB -1 - ''; - "legacy+gpt" = '' - parted --script $diskImage -- \ - mklabel gpt \ - mkpart no-fs 1MB 2MB \ - set 1 bios_grub on \ - align-check optimal 1 \ - mkpart primary ext4 2MB -1 \ - align-check optimal 2 \ - print - ${lib.optionalString deterministic '' + partitionDiskScript = + { + # switch-case + legacy = '' + parted --script $diskImage -- \ + mklabel msdos \ + mkpart primary ext4 1MiB 100% \ + print + ''; + "legacy+gpt" = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart no-fs 1MiB 2MiB \ + set 1 bios_grub on \ + mkpart primary ext4 2MiB 100% \ + align-check optimal 2 \ + print + ${lib.optionalString deterministic '' sgdisk \ --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --partition-guid=3:${rootGPUID} \ $diskImage - ''} - ''; - efi = '' - parted --script $diskImage -- \ - mklabel gpt \ - mkpart ESP fat32 8MiB ${bootSize} \ - set 1 boot on \ - mkpart primary ext4 ${bootSize} -1 - ${lib.optionalString deterministic '' + ''} + ''; + efi = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB $bootSizeMiB \ + set 1 boot on \ + align-check optimal 1 \ + mkpart primary ext4 $bootSizeMiB 100% \ + align-check optimal 2 \ + print + ${lib.optionalString deterministic '' sgdisk \ --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ --partition-guid=2:${rootGPUID} \ $diskImage - ''} - ''; - efixbootldr = '' - parted --script $diskImage -- \ - mklabel gpt \ - mkpart ESP fat32 8MiB 100MiB \ - set 1 boot on \ - mkpart BOOT fat32 100MiB ${bootSize} \ - set 2 bls_boot on \ - mkpart ROOT ext4 ${bootSize} -1 - ${lib.optionalString deterministic '' + ''} + ''; + efixbootldr = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB 100MiB \ + set 1 boot on \ + align-check optimal 1 \ + mkpart BOOT fat32 100MiB $bootSizeMiB \ + set 2 bls_boot on \ + align-check optimal 2 \ + mkpart ROOT ext4 $bootSizeMiB 100% \ + align-check optimal 3 \ + print + ${lib.optionalString deterministic '' sgdisk \ --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --partition-guid=3:${rootGPUID} \ $diskImage - ''} - ''; - hybrid = '' - parted --script $diskImage -- \ - mklabel gpt \ - mkpart ESP fat32 8MiB ${bootSize} \ - set 1 boot on \ - mkpart no-fs 0 1024KiB \ - set 2 bios_grub on \ - mkpart primary ext4 ${bootSize} -1 - ${lib.optionalString deterministic '' + ''} + ''; + hybrid = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB $bootSizeMiB \ + set 1 boot on \ + align-check optimal 1 \ + mkpart no-fs 0 1024KiB \ + set 2 bios_grub on \ + mkpart primary ext4 $bootSizeMiB 100% \ + align-check optimal 3 \ + print + ${lib.optionalString deterministic '' sgdisk \ --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --partition-guid=3:${rootGPUID} \ $diskImage - ''} - ''; - none = ""; - }.${partitionTableType}; + ''} + ''; + none = ""; + } + .${partitionTableType}; useEFIBoot = touchEFIVars; nixpkgs = lib.cleanSource pkgs.path; # FIXME: merge with channel.nix / make-channel.nix. - channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' + channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" { } '' mkdir -p $out cp -prd ${nixpkgs.outPath} $out/nixos chmod -R u+w $out/nixos @@ -317,7 +371,9 @@ let format' = format; in let echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix ''; - binPath = lib.makeBinPath (with pkgs; [ + binPath = lib.makeBinPath ( + with pkgs; + [ rsync util-linux parted @@ -329,19 +385,19 @@ let format' = format; in let systemdMinimal ] ++ lib.optional deterministic gptfdisk - ++ stdenv.initialPath); + ++ stdenv.initialPath + ); # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) # !!! should use XML. sources = map (x: x.source) contents; targets = map (x: x.target) contents; - modes = map (x: x.mode or "''") contents; - users = map (x: x.user or "''") contents; - groups = map (x: x.group or "''") contents; + modes = map (x: x.mode or "''") contents; + users = map (x: x.user or "''") contents; + groups = map (x: x.group or "''") contents; - basePaths = [ config.system.build.toplevel ] - ++ lib.optional copyChannel channelSources; + basePaths = [ config.system.build.toplevel ] ++ lib.optional copyChannel channelSources; additionalPaths' = lib.subtractLists basePaths additionalPaths; @@ -381,6 +437,10 @@ let format' = format; in let echo $(( $1 * 52 / 1000 )) } + round_to_nearest() { + echo $(( ( $1 / $2 + 1) * $2 )) + } + mkdir $out root="$PWD/root" @@ -444,75 +504,102 @@ let format' = format; in let ${if copyChannel then "--channel ${channelSources}" else "--no-channel-copy"} \ --substituters "" - ${lib.optionalString (additionalPaths' != []) '' + ${lib.optionalString (additionalPaths' != [ ]) '' nix --extra-experimental-features nix-command copy --to $root --no-check-sigs ${lib.concatStringsSep " " additionalPaths'} ''} diskImage=nixos.raw - ${if diskSize == "auto" then '' - ${if partitionTableType == "efi" || partitionTableType == "efixbootldr" || partitionTableType == "hybrid" then '' - # Add the GPT at the end - gptSpace=$(( 512 * 34 * 1 )) - # Normally we'd need to account for alignment and things, if bootSize - # represented the actual size of the boot partition. But it instead - # represents the offset at which it ends. - # So we know bootSize is the reserved space in front of the partition. - reservedSpace=$(( gptSpace + $(numfmt --from=iec '${bootSize}') )) - '' else if partitionTableType == "legacy+gpt" then '' - # Add the GPT at the end - gptSpace=$(( 512 * 34 * 1 )) - # And include the bios_grub partition; the ext4 partition starts at 2MB exactly. - reservedSpace=$(( gptSpace + 2 * mebibyte )) - '' else if partitionTableType == "legacy" then '' - # Add the 1MiB aligned reserved space (includes MBR) - reservedSpace=$(( mebibyte )) - '' else '' - reservedSpace=0 - ''} - additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) + bootSize=$(round_to_nearest $(numfmt --from=iec '${bootSize}') $mebibyte) + bootSizeMiB=$(( bootSize / 1024 / 1024 ))MiB - # Compute required space in filesystem blocks - diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --count-links --block-size "${blockSize}" | cut -f1 | sum_lines) - # Each inode takes space! - numInodes=$(find . | wc -l) - # Convert to bytes, inodes take two blocks each! - diskUsage=$(( (diskUsage + 2 * numInodes) * ${blockSize} )) - # Then increase the required space to account for the reserved blocks. - fudge=$(compute_fudge $diskUsage) - requiredFilesystemSpace=$(( diskUsage + fudge )) + ${ + if diskSize == "auto" then + '' + ${ + if + partitionTableType == "efi" || partitionTableType == "efixbootldr" || partitionTableType == "hybrid" + then + '' + # Add the GPT at the end + gptSpace=$(( 512 * 34 * 1 )) + # Normally we'd need to account for alignment and things, if bootSize + # represented the actual size of the boot partition. But it instead + # represents the offset at which it ends. + # So we know bootSize is the reserved space in front of the partition. + reservedSpace=$(( gptSpace + bootSize )) + '' + else if partitionTableType == "legacy+gpt" then + '' + # Add the GPT at the end + gptSpace=$(( 512 * 34 * 1 )) + # And include the bios_grub partition; the ext4 partition starts at 2MiB exactly. + reservedSpace=$(( gptSpace + 2 * mebibyte )) + '' + else if partitionTableType == "legacy" then + '' + # Add the 1MiB aligned reserved space (includes MBR) + reservedSpace=$(( mebibyte )) + '' + else + '' + reservedSpace=0 + '' + } + additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) - diskSize=$(( requiredFilesystemSpace + additionalSpace )) + # Compute required space in filesystem blocks + diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --count-links --block-size "${blockSize}" | cut -f1 | sum_lines) + # Each inode takes space! + numInodes=$(find . | wc -l) + # Convert to bytes, inodes take two blocks each! + diskUsage=$(( (diskUsage + 2 * numInodes) * ${blockSize} )) + # Then increase the required space to account for the reserved blocks. + fudge=$(compute_fudge $diskUsage) + requiredFilesystemSpace=$(( diskUsage + fudge )) - # Round up to the nearest mebibyte. - # This ensures whole 512 bytes sector sizes in the disk image - # and helps towards aligning partitions optimally. - if (( diskSize % mebibyte )); then - diskSize=$(( ( diskSize / mebibyte + 1) * mebibyte )) - fi + # Round up to the nearest block size. + # This ensures whole $blockSize bytes block sizes in the filesystem + # and helps towards aligning partitions optimally. + requiredFilesystemSpace=$(round_to_nearest $requiredFilesystemSpace ${blockSize}) - truncate -s "$diskSize" $diskImage + diskSize=$(( requiredFilesystemSpace + additionalSpace )) - printf "Automatic disk size...\n" - printf " Closure space use: %d bytes\n" $diskUsage - printf " fudge: %d bytes\n" $fudge - printf " Filesystem size needed: %d bytes\n" $requiredFilesystemSpace - printf " Additional space: %d bytes\n" $additionalSpace - printf " Disk image size: %d bytes\n" $diskSize - '' else '' - truncate -s ${toString diskSize}M $diskImage - ''} + # Round up to the nearest mebibyte. + # This ensures whole 512 bytes sector sizes in the disk image + # and helps towards aligning partitions optimally. + diskSize=$(round_to_nearest $diskSize $mebibyte) + + truncate -s "$diskSize" $diskImage + + printf "Automatic disk size...\n" + printf " Closure space use: %d bytes\n" $diskUsage + printf " fudge: %d bytes\n" $fudge + printf " Filesystem size needed: %d bytes\n" $requiredFilesystemSpace + printf " Additional space: %d bytes\n" $additionalSpace + printf " Disk image size: %d bytes\n" $diskSize + '' + else + '' + truncate -s ${toString diskSize}M $diskImage + '' + } ${partitionDiskScript} - ${if partitionTableType != "none" then '' - # Get start & length of the root partition in sectors to $START and $SECTORS. - eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) + ${ + if partitionTableType != "none" then + '' + # Get start & length of the root partition in sectors to $START and $SECTORS. + eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) - mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K - '' else '' - mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage - ''} + mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + '' + else + '' + mkfs.${fsType} -b ${blockSize} -F -L ${label} $diskImage + '' + } echo "copying staging root to image..." cptofs -p ${lib.optionalString (partitionTableType != "none") "-P ${rootPartition}"} \ @@ -523,11 +610,16 @@ let format' = format; in let ''; moveOrConvertImage = '' - ${if format == "raw" then '' - mv $diskImage $out/${filename} - '' else '' - ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename} - ''} + ${ + if format == "raw" then + '' + mv $diskImage $out/${filename} + '' + else + '' + ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename} + '' + } diskImage=$out/${filename} ''; @@ -543,74 +635,87 @@ let format' = format; in let ''; buildImage = pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand name { - preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; - buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; - postVM = moveOrConvertImage + createHydraBuildProducts + postVM; - QEMU_OPTS = - lib.concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" - ++ lib.optionals touchEFIVars [ - "-drive if=pflash,format=raw,unit=1,file=$efiVars" - ] ++ lib.optionals (OVMF.systemManagementModeRequired or false) [ - "-machine" "q35,smm=on" - "-global" "driver=cfi.pflash01,property=secure,value=on" - ] - ); - inherit memSize; - } '' - export PATH=${binPath}:$PATH + pkgs.runCommand name + { + preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; + buildInputs = with pkgs; [ + util-linux + e2fsprogs + dosfstools + ]; + postVM = moveOrConvertImage + createHydraBuildProducts + postVM; + QEMU_OPTS = lib.concatStringsSep " " ( + lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" + ++ lib.optionals touchEFIVars [ + "-drive if=pflash,format=raw,unit=1,file=$efiVars" + ] + ++ lib.optionals (OVMF.systemManagementModeRequired or false) [ + "-machine" + "q35,smm=on" + "-global" + "driver=cfi.pflash01,property=secure,value=on" + ] + ); + inherit memSize; + } + '' + export PATH=${binPath}:$PATH - rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} + rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} - # It is necessary to set root filesystem unique identifier in advance, otherwise - # bootloader might get the wrong one and fail to boot. - # At the end, we reset again because we want deterministic timestamps. - ${lib.optionalString (fsType == "ext4" && deterministic) '' - tune2fs -T now ${lib.optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk - ''} - # make systemd-boot find ESP without udev - mkdir /dev/block - ln -s /dev/vda1 /dev/block/254:1 + # It is necessary to set root filesystem unique identifier in advance, otherwise + # bootloader might get the wrong one and fail to boot. + # At the end, we reset again because we want deterministic timestamps. + ${lib.optionalString (fsType == "ext4" && deterministic) '' + tune2fs -T now ${lib.optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk + ''} + # make systemd-boot find ESP without udev + mkdir /dev/block + ln -s /dev/vda1 /dev/block/254:1 - mountPoint=/mnt - mkdir $mountPoint - mount $rootDisk $mountPoint + mountPoint=/mnt + mkdir $mountPoint + mount $rootDisk $mountPoint - # Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an - # '-E offset=X' option, so we can't do this outside the VM. - ${lib.optionalString (partitionTableType == "efi" || partitionTableType == "hybrid") '' - mkdir -p /mnt/boot - mkfs.vfat -n ESP /dev/vda1 - mount /dev/vda1 /mnt/boot + # Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an + # '-E offset=X' option, so we can't do this outside the VM. + ${lib.optionalString (partitionTableType == "efi" || partitionTableType == "hybrid") '' + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda1 + mount /dev/vda1 /mnt/boot - ${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} - ''} - ${lib.optionalString (partitionTableType == "efixbootldr") '' - mkdir -p /mnt/{boot,efi} - mkfs.vfat -n ESP /dev/vda1 - mkfs.vfat -n BOOT /dev/vda2 - mount /dev/vda1 /mnt/efi - mount /dev/vda2 /mnt/boot + ${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} + ''} + ${lib.optionalString (partitionTableType == "efixbootldr") '' + mkdir -p /mnt/{boot,efi} + mkfs.vfat -n ESP /dev/vda1 + mkfs.vfat -n BOOT /dev/vda2 + mount /dev/vda1 /mnt/efi + mount /dev/vda2 /mnt/boot - ${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} - ''} + ${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} + ''} - # Install a configuration.nix - mkdir -p /mnt/etc/nixos - ${lib.optionalString (configFile != null) '' - cp ${configFile} /mnt/etc/nixos/configuration.nix - ''} + # Install a configuration.nix + mkdir -p /mnt/etc/nixos + ${lib.optionalString (configFile != null) '' + cp ${configFile} /mnt/etc/nixos/configuration.nix + ''} - ${lib.optionalString installBootLoader '' - # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb - # Use this option to create a symlink from vda to any arbitrary device you want. - ${lib.optionalString (config.boot.loader.grub.enable) (lib.concatMapStringsSep " " (device: - lib.optionalString (device != "/dev/vda") '' - mkdir -p "$(dirname ${device})" - ln -s /dev/vda ${device} - '') config.boot.loader.grub.devices)} + ${lib.optionalString installBootLoader '' + # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb + # Use this option to create a symlink from vda to any arbitrary device you want. + ${lib.optionalString (config.boot.loader.grub.enable) ( + lib.concatMapStringsSep " " ( + device: + lib.optionalString (device != "/dev/vda") '' + mkdir -p "$(dirname ${device})" + ln -s /dev/vda ${device} + '' + ) config.boot.loader.grub.devices + )} - # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. + # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. # NOTE: systemd-boot-builder.py calls nix-env --list-generations which # clobbers $HOME/.nix-defexpr/channels/nixos This would cause a folder @@ -621,37 +726,37 @@ let format' = format; in let NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot ''} - # Set the ownerships of the contents. The modes are set in preVM. - # No globbing on targets, so no need to set -f - targets_=(${lib.concatStringsSep " " targets}) - users_=(${lib.concatStringsSep " " users}) - groups_=(${lib.concatStringsSep " " groups}) - for ((i = 0; i < ''${#targets_[@]}; i++)); do - target="''${targets_[$i]}" - user="''${users_[$i]}" - group="''${groups_[$i]}" - if [ -n "$user$group" ]; then - # We have to nixos-enter since we need to use the user and group of the VM - nixos-enter --root $mountPoint -- chown -R "$user:$group" "$target" - fi - done + # Set the ownerships of the contents. The modes are set in preVM. + # No globbing on targets, so no need to set -f + targets_=(${lib.concatStringsSep " " targets}) + users_=(${lib.concatStringsSep " " users}) + groups_=(${lib.concatStringsSep " " groups}) + for ((i = 0; i < ''${#targets_[@]}; i++)); do + target="''${targets_[$i]}" + user="''${users_[$i]}" + group="''${groups_[$i]}" + if [ -n "$user$group" ]; then + # We have to nixos-enter since we need to use the user and group of the VM + nixos-enter --root $mountPoint -- chown -R "$user:$group" "$target" + fi + done - umount -R /mnt + umount -R /mnt - # Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal - # mount, so the `-c 0` and `-i 0` don't affect it. Setting it to `now` doesn't produce deterministic - # output, of course, but we can fix that when/if we start making images deterministic. - # In deterministic mode, this is fixed to 1970-01-01 (UNIX timestamp 0). - # This two-step approach is necessary otherwise `tune2fs` will want a fresher filesystem to perform - # some changes. - ${lib.optionalString (fsType == "ext4") '' - tune2fs -T now ${lib.optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk - ${lib.optionalString deterministic "tune2fs -f -T 19700101 $rootDisk"} - ''} - '' + # Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal + # mount, so the `-c 0` and `-i 0` don't affect it. Setting it to `now` doesn't produce deterministic + # output, of course, but we can fix that when/if we start making images deterministic. + # In deterministic mode, this is fixed to 1970-01-01 (UNIX timestamp 0). + # This two-step approach is necessary otherwise `tune2fs` will want a fresher filesystem to perform + # some changes. + ${lib.optionalString (fsType == "ext4") '' + tune2fs -T now ${lib.optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk + ${lib.optionalString deterministic "tune2fs -f -T 19700101 $rootDisk"} + ''} + '' ); in - if onlyNixStore then - pkgs.runCommand name {} - (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM) - else buildImage +if onlyNixStore then + pkgs.runCommand name { } (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM) +else + buildImage diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 1a0017a1799a..8fadc79a13dc 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - sources_=($sources) targets_=($targets) diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index b554f7316779..ad86e2062975 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -105,14 +105,16 @@ def _perform_ocr_on_screenshot( tess_args = "-c debug_file=/dev/null --psm 11" - cmd = f"convert {magick_args} '{screenshot_path}' 'tiff:{screenshot_path}.tiff'" + cmd = f"magick convert {magick_args} '{screenshot_path}' '{screenshot_path}.png'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: - raise Exception(f"TIFF conversion failed with exit code {ret.returncode}") + raise Exception( + f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}" + ) model_results = [] for model_id in model_ids: - cmd = f"tesseract '{screenshot_path}.tiff' - {tess_args} --oem '{model_id}'" + cmd = f"tesseract '{screenshot_path}.png' - {tess_args} --oem '{model_id}'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: raise Exception(f"OCR failed with exit code {ret.returncode}") @@ -352,7 +354,7 @@ class Machine: timing out. """ - def check_active(_: Any) -> bool: + def check_active(_last_try: bool) -> bool: state = self.get_unit_property(unit, "ActiveState", user) if state == "failed": raise Exception(f'unit "{unit}" reached state "{state}"') @@ -637,7 +639,7 @@ class Machine: """ output = "" - def check_success(_: Any) -> bool: + def check_success(_last_try: bool) -> bool: nonlocal output status, output = self.execute(command, timeout=timeout) return status == 0 @@ -652,7 +654,7 @@ class Machine: """ output = "" - def check_failure(_: Any) -> bool: + def check_failure(_last_try: bool) -> bool: nonlocal output status, output = self.execute(command, timeout=timeout) return status != 0 @@ -712,9 +714,9 @@ class Machine: """ matcher = re.compile(regexp) - def tty_matches(last: bool) -> bool: + def tty_matches(last_try: bool) -> bool: text = self.get_tty_text(tty) - if last: + if last_try: self.log( f"Last chance to match /{regexp}/ on TTY{tty}, " f"which currently contains: {text}" @@ -739,7 +741,7 @@ class Machine: Waits until the file exists in the machine's file system. """ - def check_file(_: Any) -> bool: + def check_file(_last_try: bool) -> bool: status, _ = self.execute(f"test -e {filename}") return status == 0 @@ -754,7 +756,7 @@ class Machine: (default `localhost`). """ - def port_is_open(_: Any) -> bool: + def port_is_open(_last_try: bool) -> bool: status, _ = self.execute(f"nc -z {addr} {port}") return status == 0 @@ -774,7 +776,7 @@ class Machine: "-uU" if is_datagram else "-U", ] - def socket_is_open(_: Any) -> bool: + def socket_is_open(_last_try: bool) -> bool: status, _ = self.execute(f"nc {' '.join(nc_flags)} {addr}") return status == 0 @@ -791,7 +793,7 @@ class Machine: (default `localhost`). """ - def port_is_closed(_: Any) -> bool: + def port_is_closed(_last_try: bool) -> bool: status, _ = self.execute(f"nc -z {addr} {port}") return status != 0 @@ -984,13 +986,13 @@ class Machine: ::: """ - def screen_matches(last: bool) -> bool: + def screen_matches(last_try: bool) -> bool: variants = self.get_screen_text_variants() for text in variants: if re.search(regex, text) is not None: return True - if last: + if last_try: self.log(f"Last OCR attempt failed. Text was: {variants}") return False @@ -1008,7 +1010,7 @@ class Machine: # to match multiline regexes. console = io.StringIO() - def console_matches(_: Any) -> bool: + def console_matches(_last_try: bool) -> bool: nonlocal console try: # This will return as soon as possible and @@ -1154,7 +1156,7 @@ class Machine: Wait until it is possible to connect to the X server. """ - def check_x(_: Any) -> bool: + def check_x(_last_try: bool) -> bool: cmd = ( "journalctl -b SYSLOG_IDENTIFIER=systemd | " + 'grep "Reached target Current graphical"' diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 85ad59698b20..e4d03f39018e 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -43,7 +43,7 @@ let manPage = ./manpages/nixos-version.8; }; - nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; + nixos-install = pkgs.nixos-install.override { }; nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; nixos-rebuild-ng = pkgs.nixos-rebuild-ng.override { nix = config.nix.package; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6816b26cfb7f..7364d8c598db 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1329,6 +1329,7 @@ ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix ./services/networking/zapret.nix + ./services/networking/yggdrasil-jumper.nix ./services/networking/zerobin.nix ./services/networking/zenohd.nix ./services/networking/zeronet.nix diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 8d501f686660..47c5e0de3f8b 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -12,16 +12,18 @@ let cfg = config.programs.command-not-found; - commandNotFound = pkgs.substituteAll { + commandNotFound = pkgs.replaceVarsWith { name = "command-not-found"; dir = "bin"; src = ./command-not-found.pl; isExecutable = true; - inherit (cfg) dbPath; - perl = pkgs.perl.withPackages (p: [ - p.DBDSQLite - p.StringShellQuote - ]); + replacements = { + inherit (cfg) dbPath; + perl = pkgs.perl.withPackages (p: [ + p.DBDSQLite + p.StringShellQuote + ]); + }; }; in diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index 83822cdc2c7f..fe4a2610903b 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -7,25 +7,63 @@ let inherit (lib) getExe + isBool + literalExpression maintainers mkEnableOption mkIf + mkMerge mkOption + mkPackageOption optionalString + replaceChars + substring + toLower types ; - inherit (types) str; + inherit (types) + bool + either + listOf + str + submodule + ; + cfg = config.programs.pay-respects; + settingsFormat = pkgs.formats.toml { }; + inherit (settingsFormat) generate type; + + finalPackage = + if cfg.aiIntegration != true then + (pkgs.runCommand "pay-respects-wrapper" + { + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + inherit (cfg.package) meta; + } + '' + mkdir -p $out/bin + makeWrapper ${getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} \ + ${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"} + ${optionalString (cfg.aiIntegration != false) '' + --set _PR_AI_URL ${cfg.aiIntegration.url} \ + --set _PR_AI_MODEL ${cfg.aiIntegration.model} \ + --set _PR_AI_LOCALE ${cfg.aiIntegration.locale} + ''} + '' + ) + else + cfg.package; + initScript = shell: if (shell != "fish") then '' - eval $(${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias}) + eval $(${getExe finalPackage} ${shell} --alias ${cfg.alias}) '' else '' - ${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias} | source + ${getExe finalPackage} ${shell} --alias ${cfg.alias} | source ''; in { @@ -33,6 +71,8 @@ in programs.pay-respects = { enable = mkEnableOption "pay-respects, an app which corrects your previous console command"; + package = mkPackageOption pkgs "pay-respects" { }; + alias = mkOption { default = "f"; type = str; @@ -41,11 +81,104 @@ in The default value is `f`, but you can use anything else as well. ''; }; + runtimeRules = mkOption { + type = listOf type; + default = [ ]; + example = literalExpression '' + [ + { + command = "xl"; + match_err = [ + { + pattern = [ + "Permission denied" + ]; + suggest = [ + ''' + #[executable(sudo), !cmd_contains(sudo), err_contains(libxl: error:)] + sudo {{command}} + ''' + ]; + } + ]; + } + ]; + ''; + description = '' + List of rules to be added to `/etc/xdg/pay-respects/rules`. + `pay-respects` will read the contents of these generated rules to recommend command corrections. + Each rule module should start with the `command` attribute that specifies the command name. See the [upstream documentation](https://codeberg.org/iff/pay-respects/src/branch/main/rules.md) for more information. + ''; + }; + aiIntegration = mkOption { + default = false; + example = { + url = "http://127.0.0.1:11434/v1/chat/completions"; + model = "llama3"; + locale = "nl-be"; + }; + description = '' + Whether to enable `pay-respects`' LLM integration. When there is no rule for a given error, `pay-respects` can query an OpenAI-compatible API endpoint for command corrections. + + - If this is set to `false`, all LLM-related features are disabled. + - If this is set to `true`, the default OpenAI endpoint will be used, using upstream's API key. This default API key may be rate-limited. + - You can also set a custom API endpoint, large language model and locale for command corrections. Simply access the `aiIntegration.url`, `aiIntegration.model` and `aiIntegration.locale` options, as described in the example. + - Take a look at the [services.ollama](#opt-services.ollama.enable) NixOS module if you wish to host a local large language model for `pay-respects`. + + For all of these methods, you can set a custom secret API key by using the `_PR_AI_API_KEY` environment variable. + ''; + type = either bool (submodule { + options = { + url = mkOption { + default = ""; + example = "https://api.openai.com/v1/chat/completions"; + type = str; + description = "The OpenAI-compatible API endpoint that `pay-respects` will query for command corrections."; + }; + model = mkOption { + default = ""; + example = "llama3"; + type = str; + description = "The model used by `pay-respects` to generate command corrections."; + }; + locale = mkOption { + default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale)); + example = "nl-be"; + type = str; + description = '' + The locale to be used for LLM responses. + The accepted format is a lowercase [`ISO 639-1` language code](https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes), followed by a dash '-', followed by a lowercase [`ISO 3166-1 alpha-2` country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). + ''; + }; + }; + }); + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.pay-respects ]; + assertions = + map + (attr: { + assertion = (!isBool cfg.aiIntegration) -> (cfg.aiIntegration.${attr} != ""); + message = '' + programs.pay-respects.aiIntegration is configured as a submodule, but you have not configured a value for programs.pay-respects.aiIntegration.${attr}! + ''; + }) + [ + "url" + "model" + ]; + environment = mkMerge ( + [ + { + systemPackages = [ finalPackage ]; + } + ] + ++ map (rule: { + etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; + }) cfg.runtimeRules + ); programs = { bash.interactiveShellInit = initScript "bash"; diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index a26dc493cdb0..ace47e862aad 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -86,9 +86,7 @@ in [ "sound" "enableOSSEmulation" ] [ "hardware" "alsa" "enableOSSEmulation" ] ) - (lib.mkRenamedOptionModule - [ "sound" "extraConfig" ] - [ "hardware" "alsa" "config" ]) + (lib.mkRenamedOptionModule [ "sound" "extraConfig" ] [ "hardware" "alsa" "config" ]) ]; options.hardware.alsa = { @@ -191,7 +189,7 @@ in }; }) ); - default = {}; + default = { }; example = lib.literalExpression '' { firefox = { device = "front"; maxVolume = -25.0; }; @@ -286,154 +284,176 @@ in }; - config = lib.mkIf cfg.enable { - - # Disable sound servers enabled by default and, - # if the user enabled one manually, cause a conflict. - services.pipewire.enable = false; - hardware.pulseaudio.enable = false; - - hardware.alsa.config = - let - conf = [ - '' - pcm.!default fromenv - - # Read the capture and playback device from - # the ALSA_AUDIO_IN, ALSA_AUDIO_OUT variables - pcm.fromenv { - type asym - playback.pcm { - type plug - slave.pcm { - @func getenv - vars [ ALSA_AUDIO_OUT ] - default pcm.sysdefault - } - } - capture.pcm { - type plug - slave.pcm { - @func getenv - vars [ ALSA_AUDIO_IN ] - default pcm.sysdefault - } - } - } - '' - (lib.optional cfg.enableRecorder '' - pcm.!default "splitter:fromenv,recorder" - - # Send audio to two stereo devices - pcm.splitter { - @args [ A B ] - @args.A.type string - @args.B.type string - type asym - playback.pcm { - type plug - route_policy "duplicate" - slave.pcm { - type multi - slaves.a.pcm $A - slaves.b.pcm $B - slaves.a.channels 2 - slaves.b.channels 2 - bindings [ - { slave a channel 0 } - { slave a channel 1 } - { slave b channel 0 } - { slave b channel 1 } - ] - } - } - capture.pcm $A - } - - # Device which records and plays back audio - pcm.recorder { - type asym - capture.pcm { - type dsnoop - ipc_key 9165218 - ipc_perm 0666 - slave.pcm "hw:loopback,1,0" - slave.period_size 1024 - slave.buffer_size 8192 - } - playback.pcm { - type dmix - ipc_key 6181923 - ipc_perm 0666 - slave.pcm "hw:loopback,0,0" - slave.period_size 1024 - slave.buffer_size 8192 - } - } - '') - (lib.mapAttrsToList mkControl cfg.controls) - (lib.mapAttrsToList (n: v: "pcm.${n} ${quote v}") cfg.deviceAliases) - ]; - in - lib.mkBefore (lib.concatStringsSep "\n" (lib.flatten conf)); - - hardware.alsa.cardAliases = lib.mkIf cfg.enableRecorder { - loopback.driver = "snd_aloop"; - loopback.id = 2; - }; - - # Set default PCM devices - environment.sessionVariables = defaultDeviceVars; - systemd.globalEnvironment = defaultDeviceVars; - - environment.etc."asound.conf".text = cfg.config; - - boot.kernelModules = - [ ] - ++ lib.optionals cfg.enableOSSEmulation [ "snd_pcm_oss" "snd_mixer_oss" ] - ++ lib.optionals cfg.enableRecorder [ "snd_aloop" ]; - - # Assign names to the sound cards - boot.extraModprobeConfig = lib.concatStringsSep "\n" cardsConfig; - - # Provide alsamixer, aplay, arecord, etc. - environment.systemPackages = [ pkgs.alsa-utils ]; - - # Install udev rules for restoring card settings on boot - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" - GOTO="alsa_restore_end" - - LABEL="alsa_restore_go" - TEST!="/etc/alsa/state-daemon.conf", RUN+="${alsactl} restore -gU $attr{device/number}" - TEST=="/etc/alsa/state-daemon.conf", RUN+="${alsactl} nrestore -gU $attr{device/number}" - LABEL="alsa_restore_end" + options.hardware.alsa.enablePersistence = lib.mkOption { + type = lib.types.bool; + defaultText = lib.literalExpression "config.hardware.alsa.enable"; + default = config.hardware.alsa.enable; + description = '' + Whether to enable ALSA sound card state saving on shutdown. + This is generally not necessary if you're using an external sound server. ''; - - # Service to store/restore the sound card settings - systemd.services.alsa-store = { - description = "Store Sound Card State"; - wantedBy = [ "multi-user.target" ]; - restartIfChanged = false; - unitConfig = { - RequiresMountsFor = "/var/lib/alsa"; - ConditionVirtualization = "!systemd-nspawn"; - }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - StateDirectory = "alsa"; - # Note: the service should never be restated, otherwise any - # setting changed between the last `store` and now will be lost. - # To prevent NixOS from starting it in case it has failed we - # expand the exit codes considered successful - SuccessExitStatus = [ 0 99 ]; - ExecStart = "${alsactl} restore -gU"; - ExecStop = "${alsactl} store -gU"; - }; - }; }; + config = lib.mkMerge [ + + (lib.mkIf cfg.enable { + # Disable sound servers enabled by default and, + # if the user enabled one manually, cause a conflict. + services.pipewire.enable = false; + services.pulseaudio.enable = false; + + hardware.alsa.config = + let + conf = [ + '' + pcm.!default fromenv + + # Read the capture and playback device from + # the ALSA_AUDIO_IN, ALSA_AUDIO_OUT variables + pcm.fromenv { + type asym + playback.pcm { + type plug + slave.pcm { + @func getenv + vars [ ALSA_AUDIO_OUT ] + default pcm.sysdefault + } + } + capture.pcm { + type plug + slave.pcm { + @func getenv + vars [ ALSA_AUDIO_IN ] + default pcm.sysdefault + } + } + } + '' + (lib.optional cfg.enableRecorder '' + pcm.!default "splitter:fromenv,recorder" + + # Send audio to two stereo devices + pcm.splitter { + @args [ A B ] + @args.A.type string + @args.B.type string + type asym + playback.pcm { + type plug + route_policy "duplicate" + slave.pcm { + type multi + slaves.a.pcm $A + slaves.b.pcm $B + slaves.a.channels 2 + slaves.b.channels 2 + bindings [ + { slave a channel 0 } + { slave a channel 1 } + { slave b channel 0 } + { slave b channel 1 } + ] + } + } + capture.pcm $A + } + + # Device which records and plays back audio + pcm.recorder { + type asym + capture.pcm { + type dsnoop + ipc_key 9165218 + ipc_perm 0666 + slave.pcm "hw:loopback,1,0" + slave.period_size 1024 + slave.buffer_size 8192 + } + playback.pcm { + type dmix + ipc_key 6181923 + ipc_perm 0666 + slave.pcm "hw:loopback,0,0" + slave.period_size 1024 + slave.buffer_size 8192 + } + } + '') + (lib.mapAttrsToList mkControl cfg.controls) + (lib.mapAttrsToList (n: v: "pcm.${n} ${quote v}") cfg.deviceAliases) + ]; + in + lib.mkBefore (lib.concatStringsSep "\n" (lib.flatten conf)); + + hardware.alsa.cardAliases = lib.mkIf cfg.enableRecorder { + loopback.driver = "snd_aloop"; + loopback.id = 2; + }; + + # Set default PCM devices + environment.sessionVariables = defaultDeviceVars; + systemd.globalEnvironment = defaultDeviceVars; + + environment.etc."asound.conf".text = cfg.config; + + boot.kernelModules = + [ ] + ++ lib.optionals cfg.enableOSSEmulation [ + "snd_pcm_oss" + "snd_mixer_oss" + ] + ++ lib.optionals cfg.enableRecorder [ "snd_aloop" ]; + + # Assign names to the sound cards + boot.extraModprobeConfig = lib.concatStringsSep "\n" cardsConfig; + + # Provide alsamixer, aplay, arecord, etc. + environment.systemPackages = [ pkgs.alsa-utils ]; + }) + + (lib.mkIf config.hardware.alsa.enablePersistence { + + # Install udev rules for restoring card settings on boot + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" + GOTO="alsa_restore_end" + + LABEL="alsa_restore_go" + TEST!="/etc/alsa/state-daemon.conf", RUN+="${alsactl} restore -gU $attr{device/number}" + TEST=="/etc/alsa/state-daemon.conf", RUN+="${alsactl} nrestore -gU $attr{device/number}" + LABEL="alsa_restore_end" + ''; + + # Service to store/restore the sound card settings + systemd.services.alsa-store = { + description = "Store Sound Card State"; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = false; + unitConfig = { + RequiresMountsFor = "/var/lib/alsa"; + ConditionVirtualization = "!systemd-nspawn"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + StateDirectory = "alsa"; + # Note: the service should never be restated, otherwise any + # setting changed between the last `store` and now will be lost. + # To prevent NixOS from starting it in case it has failed we + # expand the exit codes considered successful + SuccessExitStatus = [ + 0 + 99 + ]; + ExecStart = "${alsactl} restore -gU"; + ExecStop = "${alsactl} store -gU"; + }; + }; + }) + + ]; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; } diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md index 2c91174732e1..8ae869308bb8 100644 --- a/nixos/modules/services/backup/borgbackup.md +++ b/nixos/modules/services/backup/borgbackup.md @@ -23,7 +23,7 @@ A complete list of options for the Borgbase module may be found A very basic configuration for backing up to a locally accessible directory is: ```nix { - opt.services.borgbackup.jobs = { + services.borgbackup.jobs = { rootBackup = { paths = "/"; exclude = [ "/nix" "/path/to/local/repo" ]; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index dd739798963c..01c40663b2b5 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -331,7 +331,6 @@ in name = "wrappedSlurm"; builder = pkgs.writeText "builder.sh" '' - source $stdenv/setup mkdir -p $out/bin find ${lib.getBin cfg.package}/bin -type f -executable | while read EXE do diff --git a/nixos/modules/services/databases/ferretdb.nix b/nixos/modules/services/databases/ferretdb.nix index a7e3fa81c48f..00d28986b532 100644 --- a/nixos/modules/services/databases/ferretdb.nix +++ b/nixos/modules/services/databases/ferretdb.nix @@ -19,8 +19,38 @@ in }; settings = lib.mkOption { - type = - lib.types.submodule { freeformType = with lib.types; attrsOf str; }; + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + options = { + FERRETDB_HANDLER = lib.mkOption { + type = lib.types.enum [ "sqlite" "pg" ]; + default = "sqlite"; + description = "Backend handler"; + }; + + FERRETDB_SQLITE_URL = lib.mkOption { + type = lib.types.str; + default = "file:/var/lib/ferretdb/"; + description = "SQLite URI (directory) for 'sqlite' handler"; + }; + + FERRETDB_POSTGRESQL_URL = lib.mkOption { + type = lib.types.str; + default = "postgres://ferretdb@localhost/ferretdb?host=/run/postgresql"; + description = "PostgreSQL URL for 'pg' handler"; + }; + + FERRETDB_TELEMETRY = lib.mkOption { + type = lib.types.enum [ "enable" "disable" ]; + default = "disable"; + description = '' + Enable or disable basic telemetry. + + See for more information. + ''; + }; + }; + }; example = { FERRETDB_LOG_LEVEL = "warn"; FERRETDB_MODE = "normal"; @@ -36,11 +66,7 @@ in config = lib.mkIf cfg.enable { - - services.ferretdb.settings = { - FERRETDB_HANDLER = lib.mkDefault "sqlite"; - FERRETDB_SQLITE_URL = lib.mkDefault "file:/var/lib/ferretdb/"; - }; + services.ferretdb.settings = { }; systemd.services.ferretdb = { description = "FerretDB"; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 59fef3824d85..51d707c6594b 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -733,10 +733,12 @@ in ] ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ]; UMask = if groupAccessAvailable then "0027" else "0077"; } - (mkIf (cfg.dataDir != "/var/lib/postgresql") { + (mkIf (cfg.dataDir != "/var/lib/postgresql/${cfg.package.psqlSchema}") { + # The user provides their own data directory ReadWritePaths = [ cfg.dataDir ]; }) (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { + # Provision the default data directory StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; StateDirectoryMode = if groupAccessAvailable then "0750" else "0700"; }) diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 7d92501821a5..018bd5f5c1cc 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -10,7 +10,6 @@ let cfg = config.services.wyoming.faster-whisper; inherit (lib) - escapeShellArgs mkOption mkEnableOption mkPackageOption @@ -240,7 +239,6 @@ in description = '' Extra arguments to pass to the server commandline. ''; - apply = escapeShellArgs; }; }; } diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 9ffb233bd71c..69b8bd959eeb 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -331,6 +331,7 @@ in ExecStart = "${cfg.package}/bin/celery --app paperless beat --loglevel INFO"; Restart = "on-failure"; LoadCredential = lib.optionalString (cfg.passwordFile != null) "PAPERLESS_ADMIN_PASSWORD:${cfg.passwordFile}"; + PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs }; environment = env; @@ -407,6 +408,7 @@ in User = cfg.user; ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer"; Restart = "on-failure"; + PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs }; environment = env; # Allow the consumer to access the private /tmp directory of the server. diff --git a/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix index 31620b31eb31..0ea4a5c163f8 100644 --- a/nixos/modules/services/monitoring/cockpit.nix +++ b/nixos/modules/services/monitoring/cockpit.nix @@ -55,6 +55,7 @@ in { systemd.packages = [ cfg.package ]; systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ]; + systemd.sockets.cockpit.listenStreams = [ "" (toString cfg.port) ]; systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd" diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index 8850d961e63d..1405cbc3e826 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -49,27 +49,31 @@ let preferLocalBuild = true; } ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}''; - setupSpoolScript = pkgs.substituteAll { + setupSpoolScript = pkgs.replaceVarsWith { name = "hylafax-setup-spool.sh"; src = ./spool.sh; isExecutable = true; - faxuser = "uucp"; - faxgroup = "uucp"; - lockPath = "/var/lock"; - inherit globalConfigPath modemConfigPath; - inherit (cfg) sendmailPath spoolAreaPath userAccessFile; - inherit (pkgs) hylafaxplus runtimeShell; + replacements = { + faxuser = "uucp"; + faxgroup = "uucp"; + lockPath = "/var/lock"; + inherit globalConfigPath modemConfigPath; + inherit (cfg) spoolAreaPath userAccessFile; + inherit (pkgs) hylafaxplus runtimeShell; + }; }; - waitFaxqScript = pkgs.substituteAll { + waitFaxqScript = pkgs.replaceVarsWith { # This script checks the modems status files # and waits until all modems report readiness. name = "hylafax-faxq-wait-start.sh"; src = ./faxq-wait.sh; isExecutable = true; - timeoutSec = toString 10; - inherit (cfg) spoolAreaPath; - inherit (pkgs) runtimeShell; + replacements = { + timeoutSec = toString 10; + inherit (cfg) spoolAreaPath; + inherit (pkgs) runtimeShell; + }; }; sockets.hylafax-hfaxd = { diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index 07a3788abf7d..3a8bb5f28fdf 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - doSub() { local src=$1 local dst=$2 diff --git a/nixos/modules/services/networking/yggdrasil-jumper.nix b/nixos/modules/services/networking/yggdrasil-jumper.nix new file mode 100644 index 000000000000..d26a69d89eea --- /dev/null +++ b/nixos/modules/services/networking/yggdrasil-jumper.nix @@ -0,0 +1,173 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + escapeShellArgs + filter + hasPrefix + mapAttrsToList + mkEnableOption + mkIf + mkOption + mkPackageOption + ; + format = pkgs.formats.toml { }; +in +{ + options = + let + inherit (lib.types) + bool + enum + lines + listOf + str + ; + in + { + services.yggdrasil-jumper = { + enable = mkEnableOption "the Yggdrasil Jumper system service"; + + retrieveListenAddresses = mkOption { + type = bool; + default = true; + description = '' + Automatically retrieve listen addresses from the Yggdrasil router configuration. + + See `yggdrasil_listen` option in Yggdrasil Jumper configuration. + ''; + }; + + appendListenAddresses = mkOption { + type = bool; + default = true; + description = '' + Append Yggdrasil router configuration with listeners on loopback + addresses (`127.0.0.1`) and preselected ports to support peering + using client-server protocols like `quic` and `tls`. + + See `Listen` option in Yggdrasil router configuration. + ''; + }; + + settings = mkOption { + type = format.type; + default = { }; + example = { + listen_port = 9999; + whitelist = [ + "" + ]; + }; + description = '' + Configuration for Yggdrasil Jumper as a Nix attribute set. + ''; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + example = '' + listen_port = 9999; + whitelist = [ + "" + ]; + ''; + description = '' + Configuration for Yggdrasil Jumper in plaintext. + ''; + }; + + package = mkPackageOption pkgs "yggdrasil-jumper" { }; + + logLevel = mkOption { + type = enum [ "off" "error" "warn" "info" "debug" "trace" ]; + default = "info"; + description = '' + Set logging verbosity for Yggdrasil Jumper. + ''; + }; + + extraArgs = mkOption { + type = listOf str; + default = [ ]; + description = '' + Extra command line arguments for Yggdrasil Jumper. + ''; + }; + }; + }; + + config = + let + cfg = config.services.yggdrasil-jumper; + + # Generate, concatenate and validate config file + jumperSettings = format.generate "yggdrasil-jumper-settings" cfg.settings; + jumperExtraConfig = pkgs.writeText "yggdrasil-jumper-extra-config" cfg.extraConfig; + jumperConfig = + pkgs.runCommand + "yggdrasil-jumper-config" + { } + '' + cat ${jumperSettings} ${jumperExtraConfig} \ + | tee $out \ + | ${cfg.package}/bin/yggdrasil-jumper --validate --config - + ''; + in + mkIf cfg.enable { + assertions = [{ + assertion = config.services.yggdrasil.enable; + message = "`services.yggdrasil.enable` must be true for `yggdrasil-jumper` to operate"; + }]; + + services.yggdrasil.settings.Listen = + let + # By default linux dynamically alocates ports in range 32768..60999 + # `sysctl net.ipv4.ip_local_port_range` + # See: https://xkcd.com/221/ + prot_port = { "tls" = 11814; "quic" = 11814; }; + in + mkIf + (cfg.retrieveListenAddresses && cfg.appendListenAddresses) + (mapAttrsToList (prot: port: "${prot}://127.0.0.1:${toString port}") prot_port); + + services.yggdrasil-jumper.settings = { + yggdrasil_admin_listen = [ "unix:///run/yggdrasil/yggdrasil.sock" ]; + yggdrasil_listen = + mkIf + cfg.retrieveListenAddresses + (filter (a: !hasPrefix "tcp://" a) config.services.yggdrasil.settings.Listen); + }; + + systemd.services.yggdrasil-jumper = { + description = "Yggdrasil Jumper Service"; + after = [ "yggdrasil.service" ]; + unitConfig.BindsTo = [ "yggdrasil.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "yggdrasil"; + DynamicUser = true; + + # TODO: Remove this delay after support for proper startup notification lands in `yggdrasil-go` + ExecStartPre = "${pkgs.coreutils}/bin/sleep 5"; + ExecStart = escapeShellArgs ([ "${cfg.package}/bin/yggdrasil-jumper" "--loglevel" "${cfg.logLevel}" "--config" "${jumperConfig}" ] ++ cfg.extraArgs); + KillSignal = "SIGINT"; + + MemoryDenyWriteExecute = true; + ProtectControlGroups = true; + ProtectHome = "tmpfs"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with lib.maintainers; [ one-d-wide ]; +} diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 07e1d8c735e9..887bee6f292a 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -43,7 +43,7 @@ in default = true; description = '' Whether to create a local database automatically. - This will override every database setting in {option}`services.engelsystem.config`. + This will override every database setting in {option}`services.engelsystem.settings`. ''; }; diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix index 9cb64a1495d5..a5a5edd6deac 100644 --- a/nixos/modules/services/web-apps/kasmweb/default.nix +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -140,31 +140,33 @@ in serviceConfig = { Type = "oneshot"; TimeoutStartSec = 300; - ExecStart = pkgs.substituteAll { + ExecStart = pkgs.replaceVarsWith { src = ./initialize_kasmweb.sh; isExecutable = true; - binPath = lib.makeBinPath [ - pkgs.docker - pkgs.openssl - pkgs.gnused - pkgs.yq-go - ]; - runtimeShell = pkgs.runtimeShell; - kasmweb = pkgs.kasmweb; - postgresUser = "postgres"; - postgresPassword = "postgres"; - inherit (cfg) - datastorePath - sslCertificate - sslCertificateKey - redisPassword - networkSubnet - defaultUserPassword - defaultAdminPassword - defaultManagerToken - defaultRegistrationToken - defaultGuacToken - ; + replacements = { + binPath = lib.makeBinPath [ + pkgs.docker + pkgs.openssl + pkgs.gnused + pkgs.yq-go + ]; + runtimeShell = pkgs.runtimeShell; + kasmweb = pkgs.kasmweb; + postgresUser = "postgres"; + postgresPassword = "postgres"; + inherit (cfg) + datastorePath + sslCertificate + sslCertificateKey + redisPassword + networkSubnet + defaultUserPassword + defaultAdminPassword + defaultManagerToken + defaultRegistrationToken + defaultGuacToken + ; + }; }; }; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 10c72550f2cd..aa9f074a6178 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -299,7 +299,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud28" "nextcloud29" "nextcloud30" ]; + relatedPackages = [ "nextcloud29" "nextcloud30" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index 8c49b87db060..348d3bbb80bf 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,8 +1,5 @@ set -e -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - mkdir -p $out/bin cat > $out/bin/control < -c [-d ] [-g ] [-n ] [-r]" >&2 diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 755ea259c425..60b9fe901db0 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -2,8 +2,7 @@ shopt -s nullglob -export PATH=/empty -for i in @path@; do PATH=$PATH:$i/bin; done +export PATH=/empty:@path@ if test $# -ne 1; then echo "Usage: init-script-builder.sh DEFAULT-CONFIG" diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 5c4974f32ae0..46abdec71db6 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -9,16 +9,18 @@ with lib; let - initScriptBuilder = pkgs.substituteAll { + initScriptBuilder = pkgs.replaceVarsWith { src = ./init-script-builder.sh; isExecutable = true; - inherit (pkgs) bash; - inherit (config.system.nixos) distroName; - path = [ - pkgs.coreutils - pkgs.gnused - pkgs.gnugrep - ]; + replacements = { + inherit (pkgs) bash; + inherit (config.system.nixos) distroName; + path = lib.makeBinPath [ + pkgs.coreutils + pkgs.gnused + pkgs.gnugrep + ]; + }; }; in diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 280d38ce32f4..ff7cf4777ddf 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -289,11 +289,8 @@ let # The init script of boot stage 1 (loading kernel modules for # mounting the root FS). - bootStage1 = pkgs.substituteAll { + bootStage1 = pkgs.replaceVarsWith { src = ./stage-1-init.sh; - - shell = "${extraUtils}/bin/ash"; - isExecutable = true; postInstall = '' @@ -304,35 +301,39 @@ let ${pkgs.buildPackages.busybox}/bin/ash -n $target ''; - inherit linkUnits udevRules extraUtils; + replacements = { + shell = "${extraUtils}/bin/ash"; - inherit (config.boot) resumeDevice; + inherit linkUnits udevRules extraUtils; - inherit (config.system.nixos) distroName; + inherit (config.boot) resumeDevice; - inherit (config.system.build) earlyMountScript; + inherit (config.system.nixos) distroName; - inherit (config.boot.initrd) checkJournalingFS verbose - preLVMCommands preDeviceCommands postDeviceCommands postResumeCommands postMountCommands preFailCommands kernelModules; + inherit (config.system.build) earlyMountScript; - resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") - (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable - # Don't include zram devices - && !(hasPrefix "/dev/zram" sd.device) - ) config.swapDevices); + inherit (config.boot.initrd) checkJournalingFS verbose + preLVMCommands preDeviceCommands postDeviceCommands postResumeCommands postMountCommands preFailCommands kernelModules; - fsInfo = - let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ]; - in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems)); + resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") + (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable + # Don't include zram devices + && !(hasPrefix "/dev/zram" sd.device) + ) config.swapDevices); - setHostId = optionalString (config.networking.hostId != null) '' - hi="${config.networking.hostId}" - ${if pkgs.stdenv.hostPlatform.isBigEndian then '' - echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid - '' else '' - echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid - ''} - ''; + fsInfo = + let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ]; + in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems)); + + setHostId = optionalString (config.networking.hostId != null) '' + hi="${config.networking.hostId}" + ${if pkgs.stdenv.hostPlatform.isBigEndian then '' + echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid + '' else '' + echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid + ''} + ''; + }; }; diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index beb887d0f3e5..d72ea225fb24 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -11,26 +11,28 @@ let useHostResolvConf = config.networking.resolvconf.enable && config.networking.useHostResolvConf; - bootStage2 = pkgs.substituteAll { + bootStage2 = pkgs.replaceVarsWith { src = ./stage-2-init.sh; - shellDebug = "${pkgs.bashInteractive}/bin/bash"; - shell = "${pkgs.bash}/bin/bash"; - inherit (config.boot) readOnlyNixStore systemdExecutable extraSystemdUnitPaths; - inherit (config.system.nixos) distroName; isExecutable = true; - inherit useHostResolvConf; - inherit (config.system.build) earlyMountScript; - path = lib.makeBinPath ( - [ - pkgs.coreutils - pkgs.util-linux - ] - ++ lib.optional useHostResolvConf pkgs.openresolv - ); - postBootCommands = pkgs.writeText "local-cmds" '' - ${config.boot.postBootCommands} - ${config.powerManagement.powerUpCommands} - ''; + replacements = { + shell = "${pkgs.bash}/bin/bash"; + systemConfig = null; # replaced in ../activation/top-level.nix + inherit (config.boot) readOnlyNixStore systemdExecutable; + inherit (config.system.nixos) distroName; + inherit useHostResolvConf; + inherit (config.system.build) earlyMountScript; + path = lib.makeBinPath ( + [ + pkgs.coreutils + pkgs.util-linux + ] + ++ lib.optional useHostResolvConf pkgs.openresolv + ); + postBootCommands = pkgs.writeText "local-cmds" '' + ${config.boot.postBootCommands} + ${config.powerManagement.powerUpCommands} + ''; + }; }; in diff --git a/nixos/modules/system/etc/test.nix b/nixos/modules/system/etc/test.nix index 5e43b155038d..af2cf5af85c4 100644 --- a/nixos/modules/system/etc/test.nix +++ b/nixos/modules/system/etc/test.nix @@ -64,7 +64,14 @@ lib.recurseIntoAttrs { } '' mkdir fake-root export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out - fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"' + if [ -e "$NIX_ATTRS_SH_FILE" ]; then + export FAKECHROOT_EXCLUDE_PATH=$FAKECHROOT_EXCLUDE_PATH:$NIX_ATTRS_SH_FILE + fi + fakechroot fakeroot chroot $PWD/fake-root bash -e -c ' + if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi + source $stdenv/setup + eval "$fakeRootCommands" + ' ''; } diff --git a/nixos/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh deleted file mode 100644 index 55c3a1ebfa8a..000000000000 --- a/nixos/modules/tasks/tty-backgrounds-combine.sh +++ /dev/null @@ -1,32 +0,0 @@ -source $stdenv/setup - -ttys=($ttys) -themes=($themes) - -mkdir -p $out - -defaultName=$(cd $default && ls | grep -v default) -echo $defaultName -ln -s $default/$defaultName $out/$defaultName -ln -s $defaultName $out/default - -for ((n = 0; n < ${#ttys[*]}; n++)); do - tty=${ttys[$n]} - theme=${themes[$n]} - - echo "TTY $tty -> $theme" - - if [ "$theme" != default ]; then - themeName=$(cd $theme && ls | grep -v default) - ln -sfn $theme/$themeName $out/$themeName - else - themeName=default - fi - - if test -e $out/$tty; then - echo "Multiple themes defined for the same TTY!" - exit 1 - fi - - ln -sfn $themeName $out/$tty -done diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 5236f5311f02..0433cebf3b56 100644 --- a/nixos/tests/cockpit.nix +++ b/nixos/tests/cockpit.nix @@ -21,10 +21,11 @@ import ./make-test-python.nix ( }; services.cockpit = { enable = true; + port = 7890; openFirewall = true; settings = { WebService = { - Origins = "https://server:9090"; + Origins = "https://server:7890"; }; }; }; @@ -65,7 +66,7 @@ import ./make-test-python.nix ( driver.implicitly_wait(10) log("Opening homepage") - driver.get("https://server:9090") + driver.get("https://server:7890") def wait_elem(by, query, timeout=10): @@ -107,7 +108,7 @@ import ./make-test-python.nix ( driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() # driver.implicitly_wait(1) - # driver.get("https://server:9090/system") + # driver.get("https://server:7890/system") log("Waiting dashboard to load") wait_title_contains("${user}@server") @@ -143,9 +144,9 @@ import ./make-test-python.nix ( start_all() server.wait_for_unit("sockets.target") - server.wait_for_open_port(9090) + server.wait_for_open_port(7890) - client.succeed("curl -k https://server:9090 -o /dev/stderr") + client.succeed("curl -k https://server:7890 -o /dev/stderr") print(client.succeed("whoami")) client.succeed('PYTHONUNBUFFERED=1 selenium-script') ''; diff --git a/nixos/tests/davis.nix b/nixos/tests/davis.nix index 68958cee7a43..0fb80d0e7e20 100644 --- a/nixos/tests/davis.nix +++ b/nixos/tests/davis.nix @@ -48,7 +48,7 @@ import ./make-test-python.nix ( "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" ) r = machine.succeed( - f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F username=admin -F password=nixos -F _csrf_token={csrf_token.strip()} -D headers" + f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers" ) print(r) machine.succeed( diff --git a/nixos/tests/ferretdb.nix b/nixos/tests/ferretdb.nix index 7251198af77d..8e6e7b6a3219 100644 --- a/nixos/tests/ferretdb.nix +++ b/nixos/tests/ferretdb.nix @@ -26,7 +26,6 @@ with import ../lib/testing-python.nix { inherit system; }; services.ferretdb = { enable = true; settings.FERRETDB_HANDLER = "pg"; - settings.FERRETDB_POSTGRESQL_URL = "postgres://ferretdb@localhost/ferretdb?host=/run/postgresql"; }; systemd.services.ferretdb.serviceConfig = { diff --git a/nixos/tests/grow-partition.nix b/nixos/tests/grow-partition.nix index c8eef519fb5c..84ea1312a03e 100644 --- a/nixos/tests/grow-partition.nix +++ b/nixos/tests/grow-partition.nix @@ -32,6 +32,9 @@ let "/".device = rootFsDevice; }; + # Needed for installing bootloader + system.switch.enable = true; + system.build.diskImage = import ../lib/make-disk-image.nix { inherit config lib pkgs; label = rootFslabel; diff --git a/nixos/tests/headscale.nix b/nixos/tests/headscale.nix index cb5ce26b7944..3ba331b7c3d4 100644 --- a/nixos/tests/headscale.nix +++ b/nixos/tests/headscale.nix @@ -13,7 +13,10 @@ import ./make-test-python.nix ( in { name = "headscale"; - meta.maintainers = with lib.maintainers; [ misterio77 ]; + meta.maintainers = with lib.maintainers; [ + kradalby + misterio77 + ]; nodes = let diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index d7394c866c14..35762652778b 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -60,6 +60,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; + + # Increase disk space to prevent this issue: + # + # WARNING h.n.DiskSpaceMonitorDescriptor#markNodeOfflineOrOnline: Making Built-In Node offline temporarily due to the lack of disk space + virtualisation.diskSize = 2 * 1024; }; slave = diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index a1aba5c1ab64..568440150b23 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -110,4 +110,4 @@ let ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 28 29 30 ]) +listToAttrs (concatMap genTests [ 29 30 ]) diff --git a/nixos/tests/pppd.nix b/nixos/tests/pppd.nix index e6e581c5d05f..ad4927e9e67b 100644 --- a/nixos/tests/pppd.nix +++ b/nixos/tests/pppd.nix @@ -5,9 +5,14 @@ import ./make-test-python.nix ( mode = "0640"; }; in + { pkgs, ... }: { name = "pppd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ stv0g ]; + }; + nodes = { server = { config, pkgs, ... }: diff --git a/nixos/tests/systemd-journal-gateway.nix b/nixos/tests/systemd-journal-gateway.nix index 1b7428590a4a..6ae009f5362c 100644 --- a/nixos/tests/systemd-journal-gateway.nix +++ b/nixos/tests/systemd-journal-gateway.nix @@ -47,7 +47,7 @@ import ./make-test-python.nix ( def copy_pem(file: str): machine.copy_from_host(source=f"{tmpdir}/{file}", target=f"/run/secrets/{file}") - machine.succeed(f"chmod 644 /run/secrets/{file}") + machine.succeed(f"chmod 600 /run/secrets/{file} && chown systemd-journal-gateway /run/secrets/{file}") with subtest("Copying keys and certificates"): machine.succeed("mkdir -p /run/secrets/{client,server}") diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix index 871c66d5350e..ab81ec0f370a 100644 --- a/nixos/tests/systemd-repart.nix +++ b/nixos/tests/systemd-repart.nix @@ -22,7 +22,7 @@ let shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name) subprocess.run([ - "${machine.config.virtualisation.qemu.package}/bin/qemu-img", + "${machine.virtualisation.qemu.package}/bin/qemu-img", "resize", "-f", "raw", @@ -151,6 +151,7 @@ in }: { virtualisation.useDefaultFilesystems = false; + virtualisation.mountHostNixStore = false; virtualisation.fileSystems = { "/" = { device = "/dev/disk/by-partlabel/created-root"; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index d8dc1998c03b..9e01aedca406 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -128,7 +128,7 @@ import ./make-test-python.nix ( # it's not possible because we're not in a tty when grepping # (i.e. hacky way to ensure that the error from above doesn't appear here). _, out = machine.execute("systemctl --user edit testservice2.service 2>&1") - assert out.rstrip("\n") == "Cannot edit units if not on a tty." + assert out.rstrip("\n") == "Cannot edit units interactively if not on a tty." # Regression test for https://github.com/NixOS/nixpkgs/issues/105049 with subtest("systemd reads timezone database in /etc/zoneinfo"): diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index e7463c8c6613..14835a9e0b60 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -9,7 +9,7 @@ libtool, pkg-config, ronn, - substituteAll, + replaceVars, buildPackages, mbrolaSupport ? true, mbrola, @@ -45,8 +45,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. - (substituteAll { - src = ./mbrola.patch; + (replaceVars ./mbrola.patch { inherit mbrola; }) ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8d709faedf94..e1fe7689a7fb 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.7"; + version = "2.4.2"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-4Jn8pyVPrTPYZGdPZB+8guxTbD6s/1OpmLJlioDQFMA="; + hash = "sha256-rpTL1eOm3PQIBuxoPEZwj64QXasNQN80kGSW7h6dDdw="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 5a90ea44a14c..d89c9c65838e 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -23,11 +23,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.9"; + version = "1.32.10"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-A7YeQATpYLrPKs2toD7ZTTduaqsnpgFEe9SQjYQHspE="; + hash = "sha256-h7LBf+DJedPvOO7O/2Nis1sorIWJ+/GFS1vnXJq2VXw="; }; outputs = [ diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 25fa6358bbd6..fca9cf907db1 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -99,8 +99,6 @@ let stdenv.mkDerivation { inherit name; builder = writeShellScript "builder.sh" '' - source $stdenv/setup - curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2) # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index d4c96b31232d..a9270da67d9f 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -22,7 +22,7 @@ withGui, python3, jemalloc, - zeromq4, + zeromq, }: mkDerivation rec { @@ -57,7 +57,7 @@ mkDerivation rec { python3 jemalloc libnatpmp - zeromq4 + zeromq miniupnpc util-linux protobuf diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c3988cdd4e68..45fa03377e69 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,7 +4,7 @@ buildPackages, fetchFromGitHub, nix-update-script, - substituteAll, + replaceVars, plymouth, pam, pkg-config, @@ -85,8 +85,7 @@ stdenv.mkDerivation rec { # Hardcode plymouth to fix transitions. # For some reason it can't find `plymouth` # even when it's in PATH in environment.systemPackages. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { plymouth = "${plymouth}/bin/plymouth"; }) ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index fbbfc835bdc3..11142a22b703 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -53,10 +53,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.8pre0.20240727.5721"; + version = "0.8pre0.20241225.10347"; src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240727.5721.tar"; - sha256 = "0f4p39vgi7fv3bh97267ys6rfy0ak0b4c15p57xfbybc47f8iwi1"; + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20241225.10347.tar"; + sha256 = "0c6rivd7qvrd02pvryffr2h6y0lyp9z0zrvdk2rygxz6l5pq0g9x"; }; packageRequires = [ persist ]; meta = { @@ -440,10 +440,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.7.0.20241129.84113"; + version = "14.0.8.0.20250101.100039"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.7.0.20241129.84113.tar"; - sha256 = "0z7a9zsbljwzrn3xzn9hcl1zlqczafvcbx62cbmlrib0cknlxqp8"; + url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250101.100039.tar"; + sha256 = "0nslxh8ai5rjpzg46ihirz4igq178f7lpybih47is7wlkj0vn68i"; }; packageRequires = [ ]; meta = { @@ -718,10 +718,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20240321.194020"; + version = "2.4.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; - sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20250101.73917.tar"; + sha256 = "0a1q6lwkky92f2fhmzlsj58cf9ywhzi2c0lhf2f6zk0ka4nz4yjz"; }; packageRequires = [ ]; meta = { @@ -811,10 +811,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.4.0.20240505.204058"; + version = "2.0.0.0.20250104.25705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar"; - sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf"; + url = "https://elpa.gnu.org/devel/boxy-2.0.0.0.20250104.25705.tar"; + sha256 = "1zy4vwlzm5gqhw2slg6j760b3hd1x989wx5p9xi9gqi2gaa43a1m"; }; packageRequires = [ ]; meta = { @@ -834,10 +834,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.6.0.20240505.204122"; + version = "2.1.8.0.20250104.93059"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar"; - sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph"; + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.8.0.20250104.93059.tar"; + sha256 = "1r4afw9m9sgk041vfrjzcz0in45wx8vc0bgl3wxr64yb64nydhx6"; }; packageRequires = [ boxy @@ -1041,10 +1041,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.7.0.20241123.92531"; + version = "1.8.0.20250103.174415"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.7.0.20241123.92531.tar"; - sha256 = "0f1l510lzhd2p6003mnp4bvrhjqpqfvvz30lrj1ic9x453z80fpq"; + url = "https://elpa.gnu.org/devel/cape-1.8.0.20250103.174415.tar"; + sha256 = "18dw6zdnppncjik06mslc0wwp65lj32x123iidb3vbk84j6qwjai"; }; packageRequires = [ compat ]; meta = { @@ -1322,10 +1322,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "1.0.2.0.20241106.200056"; + version = "1.0.2.0.20241227.162935"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-1.0.2.0.20241106.200056.tar"; - sha256 = "10pn52y3pgi2cbqi96sr3gghashsqvinc7lbylwg7mrhjgj0jdnv"; + url = "https://elpa.gnu.org/devel/company-1.0.2.0.20241227.162935.tar"; + sha256 = "17xpm50a1hvc77brwsb9kwvqxywzzz7xxjlai7rjh4nyaz0lgjr3"; }; packageRequires = [ ]; meta = { @@ -1418,10 +1418,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.0.0.0.20241120.163841"; + version = "30.0.2.0.0.20250104.123009"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20241120.163841.tar"; - sha256 = "0a67xpvjfzzbhwflldqhs8gd6cb38m6gqlv6il33d4w7wsnch4p2"; + url = "https://elpa.gnu.org/devel/compat-30.0.2.0.0.20250104.123009.tar"; + sha256 = "03inp9yr3nq1cfxby76ksg1qyr6y151wf5qx60mmfa9and8azn0r"; }; packageRequires = [ seq ]; meta = { @@ -1461,10 +1461,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.8.0.20241201.134410"; + version = "1.9.0.20250104.182417"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.8.0.20241201.134410.tar"; - sha256 = "11ndnrjfk9s99kyyygyip8bwx0icb2n8bfxk05g3ll43scblpnpx"; + url = "https://elpa.gnu.org/devel/consult-1.9.0.20250104.182417.tar"; + sha256 = "0xi7l7s1scrdy2ayrbqa8fjnjpjcrlnsw6l8avpk0xpq1gacbldj"; }; packageRequires = [ compat ]; meta = { @@ -1574,10 +1574,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.5.0.20241127.155437"; + version = "1.6.0.20250103.202938"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.5.0.20241127.155437.tar"; - sha256 = "15xs0mdbw5h84m5msviw6vp73yxjxkh6hynzaa011a8xwaz7r5v1"; + url = "https://elpa.gnu.org/devel/corfu-1.6.0.20250103.202938.tar"; + sha256 = "06kw1kj4aqr85swi35291zsv2l37fz03502qvhsqbn912kcjdaxg"; }; packageRequires = [ compat ]; meta = { @@ -1834,10 +1834,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.17.0.0.20241203.221759"; + version = "0.19.0.0.20241229.225058"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.17.0.0.20241203.221759.tar"; - sha256 = "1clhs99fh4d15mn2r5rpj9ag63nk8dksnr99zb81ywnvhf1934i0"; + url = "https://elpa.gnu.org/devel/dape-0.19.0.0.20241229.225058.tar"; + sha256 = "0v0995d4046ywwi60kcapis25nq51qdmx56i3248290nxhvd70iy"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1921,10 +1921,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.42.0.20241107.85529"; + version = "0.43.0.20250102.111202"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.42.0.20241107.85529.tar"; - sha256 = "0vmd0qmfp05xbq504mh2xh98l0h48vn3ki8c1sl26i2y2pjvy6bf"; + url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250102.111202.tar"; + sha256 = "1jy1k6sggsg84zypvy7smz1jzixz5bq08zqxs626amg29lhg3j4l"; }; packageRequires = [ soap-client ]; meta = { @@ -1968,10 +1968,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0.0.20241203.81843"; + version = "3.1.0.0.20250104.165535"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20241203.81843.tar"; - sha256 = "1irr0z942qdjypaxx6q1scndzzkby0kcsa18jqsxnrc5np4f8p3i"; + url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250104.165535.tar"; + sha256 = "0jb98qgz4hd8ix3m9ijn9prjrnc6f772kj4kxbnjjz4hk1dz1cdx"; }; packageRequires = [ ]; meta = { @@ -2070,6 +2070,28 @@ }; } ) { }; + dicom = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dicom"; + ename = "dicom"; + version = "0.5.0.20250101.91536"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250101.91536.tar"; + sha256 = "14d3vrk06nwzaiz26dbxx3qifiqayb6l1jd88aaa9njyxf417f01"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dicom.html"; + license = lib.licenses.free; + }; + } + ) { }; dict-tree = callPackage ( { elpaBuild, @@ -2108,10 +2130,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.10.0.0.20241128.233206"; + version = "1.10.0.0.20241205.233841"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20241128.233206.tar"; - sha256 = "1728i37sz52hf2bsbr5msvzciqdcn98xlnv812sd7mc7zz6j2q27"; + url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20241205.233841.tar"; + sha256 = "1a1ndnf6w7j0k85k1rzdi8r0m4fj78lafzsf9dl4s3dj11lqrphh"; }; packageRequires = [ cl-lib ]; meta = { @@ -2235,10 +2257,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.3.0.0.20241025.80757"; + version = "0.3.0.0.20241226.143555"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20241025.80757.tar"; - sha256 = "0xw629nhbcbk5sndgxgwl6nwf5rva7nj2h87fx73dy1fb89jz827"; + url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20241226.143555.tar"; + sha256 = "1hz6lfm12rn45n4gc3kbfsab15rzyyc71qgg1pawaxryzxp9r4fy"; }; packageRequires = [ ]; meta = { @@ -2320,10 +2342,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.2.0.20240625.155102"; + version = "0.1.2.0.20241220.111054"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar"; - sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20241220.111054.tar"; + sha256 = "0y9rgxnrar6gwqj3w622xdavi5gnb748kbym25q19a4vsjdazvi1"; }; packageRequires = [ ]; meta = { @@ -2564,10 +2586,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20241123.0.20241202.94858"; + version = "20241223.0.20241231.215609"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20241123.0.20241202.94858.tar"; - sha256 = "0id1rqva96hpn6hfn3iiprwh5k99g3cs6bn368263m2h6xvrgzsh"; + url = "https://elpa.gnu.org/devel/eev-20241223.0.20241231.215609.tar"; + sha256 = "15iivvlwkz3zigqzh4z0rp8y24p8p88l996dp9hr9kghlbsljw00"; }; packageRequires = [ ]; meta = { @@ -2585,10 +2607,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0.0.20241116.183040"; + version = "1.9.0.0.20241228.104947"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20241116.183040.tar"; - sha256 = "1xyw2pq4mv5pmssngqbvqbzqkirxm4xwg4xfbninwrk5474kmhip"; + url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20241228.104947.tar"; + sha256 = "0rzxfbw49knad8bn2xrlwwq7apmdphyg3qpry4w3d6c5rnmgarzi"; }; packageRequires = [ ]; meta = { @@ -2615,10 +2637,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20241024.85007"; + version = "1.17.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20241024.85007.tar"; - sha256 = "158022p4711xymcnkgck2bnv6w2bxj78kd7zgnxh7wp5424h4zd0"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20250101.73917.tar"; + sha256 = "1jbkjiyvv6x79gppl1cb705hlp0hp541cn8y5lav8mcy5nfhgzcl"; }; packageRequires = [ compat @@ -2672,10 +2694,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.15.0.0.20240708.123037"; + version = "1.15.0.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar"; - sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in"; + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250101.73917.tar"; + sha256 = "0pwicn9r2v85hpkxk7dibmxzy7iaj41r16lrybhm0kcw74lwhkkd"; }; packageRequires = [ ]; meta = { @@ -2718,10 +2740,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.3.0.20241123.220535"; + version = "1.1.4.0.20250102.163931"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisa-1.1.3.0.20241123.220535.tar"; - sha256 = "0zvjnz4qxaxm2akg0hppyn8vn77zvmbgnw85mms2cq4148w7br2z"; + url = "https://elpa.gnu.org/devel/elisa-1.1.4.0.20250102.163931.tar"; + sha256 = "0cfxg4ipz6k3dkap1d2clsr18nl5fi26ybkaw8fipb9z3k6hkj0h"; }; packageRequires = [ async @@ -2769,10 +2791,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.0.0.20241129.214739"; + version = "0.13.1.0.20250102.151353"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.13.0.0.20241129.214739.tar"; - sha256 = "1242ra8fbyq5lci44myvl62k76c234kxa0lsim1rmnbpsa3w3h0p"; + url = "https://elpa.gnu.org/devel/ellama-0.13.1.0.20250102.151353.tar"; + sha256 = "17pgzzanz4fcwrbirwa6pgiqv0cgsiknn9vzb0j1zd6slbbapy0h"; }; packageRequires = [ compat @@ -2905,10 +2927,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "20.2.0.20241129.151319"; + version = "21.0.20241227.75423"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-20.2.0.20241129.151319.tar"; - sha256 = "17rqxmrcr3p150nhi2yyn21g7hg68yjpxdg7bjdpif5086h8snff"; + url = "https://elpa.gnu.org/devel/emms-21.0.20241227.75423.tar"; + sha256 = "1h5hzn9va97jn4kvkd42hrrr76hh70dr19h17ikbilqn3lf2c0hl"; }; packageRequires = [ cl-lib @@ -2994,10 +3016,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20241201.105608"; + version = "5.6.1snapshot0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20241201.105608.tar"; - sha256 = "080ppzpc7r1myl2xig9jlzns9j8sbyd7qdmmijiwcfwgl6dsjg3b"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250101.73917.tar"; + sha256 = "18xjba35kccr9rsgnpsqrh1cixnfala72lykl4mgl21a0jf8vmh8"; }; packageRequires = [ compat ]; meta = { @@ -3041,10 +3063,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20241127.102031"; + version = "24.1.1.0.20241230.154327"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20241127.102031.tar"; - sha256 = "19gkxkslg9y84fc9shc655fqgcr27rbjnn4rsnhkpqvwbzn54kkq"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20241230.154327.tar"; + sha256 = "0sdqrzsii4sgyppkw6zzmci4fivhma5wap9m8wsz5g2d2qbbag2s"; }; packageRequires = [ ]; meta = { @@ -3096,10 +3118,10 @@ elpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "1.0.0.0.20240919.142744"; + version = "1.0.0.0.20241217.184034"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240919.142744.tar"; - sha256 = "01mr4aqzl8cb8jhap6pz6y561dv2hj5mykc5gdjnnfaqhypipwnq"; + url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20241217.184034.tar"; + sha256 = "1bh8109irsh2hpk70fg38d0rf8as32a39677gz1m7k7v4fvs3nv5"; }; packageRequires = [ ]; meta = { @@ -3138,10 +3160,10 @@ elpaBuild { pname = "external-completion"; ename = "external-completion"; - version = "0.1.0.20240725.13518"; + version = "0.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240725.13518.tar"; - sha256 = "0xhpmayv23iiysi5smk0sq9r8rp3vr5sq12p6584128pss75viqh"; + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20250101.73917.tar"; + sha256 = "1z3an1r72sxw4l5xlrshxcdmyv3slzqfk42wwg7zi25lq2wf60pg"; }; packageRequires = [ ]; meta = { @@ -3161,10 +3183,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.32.0.20241118.90416"; + version = "0.32.0.20250103.173706"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.32.0.20241118.90416.tar"; - sha256 = "1ssryfd1x9cidch3w0xq8750c1ifg58b672grw8x70spy2mrvqr1"; + url = "https://elpa.gnu.org/devel/exwm-0.32.0.20250103.173706.tar"; + sha256 = "0j5lvxm09vqfpggk3i1nipjmrjqbipnw9dn6gjb1xwxb7lclk62z"; }; packageRequires = [ compat @@ -3316,10 +3338,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20241024.85007"; + version = "1.3.7.0.20250102.142949"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20241024.85007.tar"; - sha256 = "0vhfxvml2s678pxivss1nmm0ym62nxc4ab221jm6x8jpd6j1lff5"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250102.142949.tar"; + sha256 = "1z23l2vh10qxkfk4dp32xzdxvsc5xvzgh7w98s3fyidmmgiwv55s"; }; packageRequires = [ eldoc @@ -3383,10 +3405,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "2.1.0.0.20240913.71012"; + version = "2.1.0.0.20241229.72347"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-2.1.0.0.20240913.71012.tar"; - sha256 = "16wsmqkm9n0hz4s50m5janni7lzvvwgrcbnp17ngyqlzkld656yk"; + url = "https://elpa.gnu.org/devel/fontaine-2.1.0.0.20241229.72347.tar"; + sha256 = "1k4vjdx0ckpwjh8w57vx6dqnwly5rx9pvir1v892gv845sr5y9ln"; }; packageRequires = [ ]; meta = { @@ -3832,10 +3854,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.11.18.0.20241025.123748"; + version = "0.12.6.0.20241231.233142"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.11.18.0.20241025.123748.tar"; - sha256 = "17sh65y476zd5lwmvialk399g5gl11d52p4jmhgjv7kpb4xl3jly"; + url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20241231.233142.tar"; + sha256 = "0gn0dbqb0lmmq5s9h5hgr2qrw229c7hgip5lpjv3lrkm1aanm72f"; }; packageRequires = [ compat @@ -4072,10 +4094,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20241126.91748"; + version = "9.0.2pre0.20241230.225211"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241126.91748.tar"; - sha256 = "136xbqhm4gwfw7cyd1p45hx6pnc6wbqc7dmv6q620vall1r9s7nb"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241230.225211.tar"; + sha256 = "0r9q9qpyc6h2320xsd5m821djii9ghpfh3wsgxkldcsb6li2qcl8"; }; packageRequires = [ ]; meta = { @@ -4449,10 +4471,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.10.0.20241201.134324"; + version = "1.11.0.20250101.92006"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.10.0.20241201.134324.tar"; - sha256 = "19clhxy5p41ri0b2fsdk2rc9wf37nn90ya5mkhpn8mccfcs9kh7y"; + url = "https://elpa.gnu.org/devel/jinx-1.11.0.20250101.92006.tar"; + sha256 = "1sqnp3hk9dzcr983xbgy4ysi5c7hpzhnv7mg7fjfissg3fmc96s9"; }; packageRequires = [ compat ]; meta = { @@ -4493,10 +4515,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20240908.123607"; + version = "20231224.0.20241205.14012"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240908.123607.tar"; - sha256 = "03zp9nsl06z1v2f3a78rbr8b7ng4dfhn3ar0rim30r99dyvf21kw"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20241205.14012.tar"; + sha256 = "0kcxgkib56fjgv9c2ancr046ag3nwr6zw5x2dzw9gbnlma5w3x66"; }; packageRequires = [ cl-lib ]; meta = { @@ -4535,10 +4557,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.25.0.20241130.63516"; + version = "1.0.25.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20241130.63516.tar"; - sha256 = "1z2vwqj213bpygq5lp8b7inxjki9kzha6ymz315ls5w06kccvw3v"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20250101.73917.tar"; + sha256 = "127q6g4gdzilxws7r72ff3wqgx80d2wz1cpvfnd0fivldmjx64j2"; }; packageRequires = [ ]; meta = { @@ -4642,10 +4664,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.4.2.0.20241022.131056"; + version = "0.4.2.0.20250104.163324"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kubed-0.4.2.0.20241022.131056.tar"; - sha256 = "02sg5h2iv9zb2i1prxab9xcm682j8y5c3h10cqd66gcvpiwb790f"; + url = "https://elpa.gnu.org/devel/kubed-0.4.2.0.20250104.163324.tar"; + sha256 = "184b41x5y06vhggvzjbyvhz8024aq68ra3mz6xwk1wbfhjhb3396"; }; packageRequires = [ ]; meta = { @@ -4783,10 +4805,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20240919.15459"; + version = "1.0.6.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240919.15459.tar"; - sha256 = "1h82ar9izb3a16w35qcvfv7k5s8rzjlkk6g3d3x7wk3rfivp8brl"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20250101.73917.tar"; + sha256 = "0lr22q8crlk160j38y5dyla1i3h882yv5zjh7f9rbfaqqs6w5xqm"; }; packageRequires = [ ]; meta = { @@ -4900,10 +4922,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.19.1.0.20241129.152751"; + version = "0.20.0.0.20250102.194115"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.19.1.0.20241129.152751.tar"; - sha256 = "07jcm718wivagwnr53rriwa7gp3zkxgybff5wivi1n6xdfhm9b1y"; + url = "https://elpa.gnu.org/devel/llm-0.20.0.0.20250102.194115.tar"; + sha256 = "1gcrks096fawiygknbny683l8m8rqiw6z29wgmal3h67z6dssvlz"; }; packageRequires = [ plz @@ -5096,10 +5118,10 @@ elpaBuild { pname = "m-buffer"; ename = "m-buffer"; - version = "0.16.0.20240302.175529"; + version = "0.16.1.0.20241215.171432"; src = fetchurl { - url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar"; - sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614"; + url = "https://elpa.gnu.org/devel/m-buffer-0.16.1.0.20241215.171432.tar"; + sha256 = "1cvygjcnhlicbjxchgc45yzmw1v07qyzhf4qbf6xgrkwv06clrd6"; }; packageRequires = [ seq ]; meta = { @@ -5117,10 +5139,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20240221.84915"; + version = "3.3.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar"; - sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250101.73917.tar"; + sha256 = "00qm9s79y4p0z9g9yc25jiy6xk29h6ddxglm3cpwgz0cwwzx426k"; }; packageRequires = [ ]; meta = { @@ -5139,10 +5161,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.7.0.20241124.113844"; + version = "1.8.0.20250101.92029"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20241124.113844.tar"; - sha256 = "19b1xc3q4mdzlipjn47drhg4k818iigf95jy2cj4hcmg6d6k37r7"; + url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250101.92029.tar"; + sha256 = "18pcby3547wrq2mc8ra85p69w16lm2gghxayzn609930zr3ndvk3"; }; packageRequires = [ compat ]; meta = { @@ -5214,6 +5236,27 @@ }; } ) { }; + matlab-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "matlab-mode"; + ename = "matlab-mode"; + version = "6.3.0.20241224.134640"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20241224.134640.tar"; + sha256 = "02y2ii89safyfj74221rlri99gr7382ir62zq2iqwvy6668srn4r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/matlab-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; mct = callPackage ( { elpaBuild, @@ -5415,10 +5458,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0.0.20241120.54202"; + version = "4.6.0.0.20241228.105002"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20241120.54202.tar"; - sha256 = "189vcdd2895x3smydr84s8ldjvi92bkh4samk4qi1gxdj9r397hg"; + url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20241228.105002.tar"; + sha256 = "174v9cxi60hng57ky2a5cssk5xjdck4sjnjhg7qlq57cbp6arj96"; }; packageRequires = [ ]; meta = { @@ -5542,10 +5585,10 @@ elpaBuild { pname = "nadvice"; ename = "nadvice"; - version = "0.4.0.20230111.104526"; + version = "0.4.0.20241227.124457"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar"; - sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr"; + url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20241227.124457.tar"; + sha256 = "1bhv1111iyypw01jpsy9p3lci2gi1bkpgfz7447f6w7rr2s9rbdr"; }; packageRequires = [ ]; meta = { @@ -5778,10 +5821,10 @@ elpaBuild { pname = "ntlm"; ename = "ntlm"; - version = "2.1.0.0.20240102.22814"; + version = "2.1.0.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar"; - sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7"; + url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20250101.73917.tar"; + sha256 = "0ld0xc1a237yah9ng723kd3ywmy4d5jly8rs2hjzc9f3bjd2sl6q"; }; packageRequires = [ ]; meta = { @@ -5975,10 +6018,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.2.0.20240926.92100"; + version = "1.3.0.20250101.92243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.2.0.20240926.92100.tar"; - sha256 = "1clbmlfrr4dq30q0yh6mrrk8i8rc49yljs83hh77z000vxzmc8qk"; + url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250101.92243.tar"; + sha256 = "1n28izngnqs2xy2iw7s0mw78mx7b4ahwf8yirr1jlv00vc51qiab"; }; packageRequires = [ compat ]; meta = { @@ -5996,10 +6039,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20241127.183434"; + version = "9.8pre0.20250104.140343"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20241127.183434.tar"; - sha256 = "1v7inlp4mm2c9395jw814krg2yp5h70h0cj0q86m26zgg9f2wicy"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20250104.140343.tar"; + sha256 = "033zb7izh6mc458kwi2iz3sbs47mrcx6v1km3z2dg39f8x87037n"; }; packageRequires = [ ]; meta = { @@ -6088,10 +6131,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.5.0.20241022.103450"; + version = "1.6.0.20250101.92312"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20241022.103450.tar"; - sha256 = "1hbgf2yggrp2jfcgi1d9wk2fg3f7f082g8xn60znkyaa7zfsn5nb"; + url = "https://elpa.gnu.org/devel/org-modern-1.6.0.20250101.92312.tar"; + sha256 = "18v29i2svvymdz3434fkpi8qljliif0q1nmczvj28rvzgli3c7jl"; }; packageRequires = [ compat ]; meta = { @@ -6132,10 +6175,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.9.0.20240505.204156"; + version = "1.0.11.0.20250104.92914"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar"; - sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp"; + url = "https://elpa.gnu.org/devel/org-real-1.0.11.0.20250104.92914.tar"; + sha256 = "11my7ygxgin8gjhmaqj3q8c3llyjgac6x5rd7mcx9qb3llpfxhmm"; }; packageRequires = [ boxy @@ -6179,10 +6222,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.4.0.0.20240922.152934"; + version = "1.4.0.0.20250102.171949"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240922.152934.tar"; - sha256 = "1p391rjvzp9im2fas8vih3mpvd9w176ykashyy5g94i0pmjfazfi"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20250102.171949.tar"; + sha256 = "1zh67ssxkkfhr459iapl50j04826fx20s7xkwjs40rs0ng8mxrw5"; }; packageRequires = [ org ]; meta = { @@ -6265,10 +6308,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.4.0.20241122.13029"; + version = "1.5.0.20250101.92420"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-1.4.0.20241122.13029.tar"; - sha256 = "0c4b0ddb5l2pipnnwcqqfjj08v9ppr93ailxq000hd683mw48kaz"; + url = "https://elpa.gnu.org/devel/osm-1.5.0.20250101.92420.tar"; + sha256 = "0cdx068pziprbsqz99p3383qlgk0v2q6q56ywrph1rnal7k19m5g"; }; packageRequires = [ compat ]; meta = { @@ -6372,10 +6415,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.2.1.0.20240220.204114"; + version = "0.2.4.0.20241220.142732"; src = fetchurl { - url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar"; - sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq"; + url = "https://elpa.gnu.org/devel/parser-generator-0.2.4.0.20241220.142732.tar"; + sha256 = "0q46ywjv4ymjal0jfmrm4i1ck6nkcil06xgzhncqp6j8fbn4mvj5"; }; packageRequires = [ ]; meta = { @@ -6563,10 +6606,10 @@ elpaBuild { pname = "plz-event-source"; ename = "plz-event-source"; - version = "0.1.2pre0.20241106.190958"; + version = "0.1.2pre0.20241227.143348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-event-source-0.1.2pre0.20241106.190958.tar"; - sha256 = "1kpwrc4c48dspyk1zm0b2wp7xmr7h1wm1j7ppqi0wrl350wjzh6f"; + url = "https://elpa.gnu.org/devel/plz-event-source-0.1.2pre0.20241227.143348.tar"; + sha256 = "010s4kfx3apdhh9z4r9d2c44arf90nbn8r1j9j3gjhpimsdjhbgq"; }; packageRequires = [ plz-media-type ]; meta = { @@ -6691,10 +6734,10 @@ elpaBuild { pname = "polymode"; ename = "polymode"; - version = "0.2.2.0.20241129.123411"; + version = "0.2.2.0.20241204.120252"; src = fetchurl { - url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20241129.123411.tar"; - sha256 = "0mrs7a8kp2mlidps76h5w0xgnilhpka7qi5pq2xc0i0lk09jd9gv"; + url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20241204.120252.tar"; + sha256 = "1ipdg4byc58gc4jncak5p6w7iyw0y173y4aky2fz88h1ccag2s2g"; }; packageRequires = [ ]; meta = { @@ -6841,10 +6884,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.11.1.0.20241204.74033"; + version = "0.11.1.0.20250104.95952"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.11.1.0.20241204.74033.tar"; - sha256 = "15npdg1cm3c1h6isq2j87djvslv4c4wan4qni09pra5hqyjmd767"; + url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250104.95952.tar"; + sha256 = "1qdffp243idkgmswqyhz0fyq120f0xx5ay31y65zfgwxbrcb35cf"; }; packageRequires = [ xref ]; meta = { @@ -6904,10 +6947,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.1.0.0.20241126.85951"; + version = "1.2.0.0.20241228.104712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.1.0.0.20241126.85951.tar"; - sha256 = "01mqy0yl72kzydqq250a2vzyyk0w1q7fpf6bb1a49yh2hkd1g5s3"; + url = "https://elpa.gnu.org/devel/pulsar-1.2.0.0.20241228.104712.tar"; + sha256 = "02625fbs1l0c1lr0gy2v3rjmb65bmvil6svx1bf9wx4l1aqhfyjz"; }; packageRequires = [ ]; meta = { @@ -6975,10 +7018,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20241123.154630"; + version = "0.28.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20241123.154630.tar"; - sha256 = "09ir2jxjk7jvzv7mz5iir3wzx0zas4ikhhh3ig9kbrsj7bsdz6dd"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20250101.73917.tar"; + sha256 = "1s3dmqdpymvnvaafjza5pi1y9rf931byk4xqk3x91sjg3bdriqka"; }; packageRequires = [ compat @@ -7404,10 +7447,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "2.0.0.20240802.81954"; + version = "2.1.0.20241229.210640"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-2.0.0.20240802.81954.tar"; - sha256 = "1ncai8nbswxgx18kc8qvm47am4n6qbhs38gjbx1ps6xxbipbks1z"; + url = "https://elpa.gnu.org/devel/relint-2.1.0.20241229.210640.tar"; + sha256 = "1gx1rq17qvq73cl8921mx6w24nq9nvaa1w1blhl4r3n4wb7j96cw"; }; packageRequires = [ xr ]; meta = { @@ -7666,10 +7709,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.4.0.0.20241123.145918"; + version = "1.4.0.0.20241224.124645"; src = fetchurl { - url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20241123.145918.tar"; - sha256 = "01s4dv75r850nq1g84ccjqzlr2xhvd1f6d3zyvdni98qm0vg9si5"; + url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20241224.124645.tar"; + sha256 = "00qyav0lrskbm9jryqlbyk4nlh9bv2191l0bjqhqhryj2hzm26rm"; }; packageRequires = [ ]; meta = { @@ -7962,10 +8005,10 @@ elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.1.2.0.20240102.22814"; + version = "1.1.2.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar"; - sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy"; + url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20250101.73917.tar"; + sha256 = "1z9mf5kac7bsqq0kkd2alcx9vvz87vsgbw753shd23y9m7ayapvx"; }; packageRequires = [ ]; meta = { @@ -7984,10 +8027,10 @@ elpaBuild { pname = "soap-client"; ename = "soap-client"; - version = "3.2.3.0.20240102.22814"; + version = "3.2.3.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar"; - sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb"; + url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20250101.73917.tar"; + sha256 = "0y2zzf5c1yfxx2wrr2ixymk2brp3x73qlxsnjkbmlb6hvjzqp704"; }; packageRequires = [ cl-lib ]; meta = { @@ -8048,10 +8091,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.5.0.0.20241114.85358"; + version = "0.5.0.0.20241214.72200"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20241114.85358.tar"; - sha256 = "1xs9mac6mrhk6519g13rf8s7q9iivd021bnwmxn54pal904x6q83"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20241214.72200.tar"; + sha256 = "1fm0r7w81cszb2az3xkazd15sfh4593myci6kqsaivnqakyvgj46"; }; packageRequires = [ ]; meta = { @@ -8060,6 +8103,28 @@ }; } ) { }; + speedrect = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "speedrect"; + ename = "speedrect"; + version = "0.7.0.20241220.133155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/speedrect-0.7.0.20241220.133155.tar"; + sha256 = "10bcmxy5pcni1789fa67awv03q17d5b3ls47vxkn1p6diiha95jw"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/speedrect.html"; + license = lib.licenses.free; + }; + } + ) { }; spinner = callPackage ( { elpaBuild, @@ -8222,10 +8287,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.1.0.0.20241025.81655"; + version = "2.2.0.0.20241229.165414"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20241025.81655.tar"; - sha256 = "0bba7mwilxhzjxcvqhgmj1gw8iw46wv6s6frx12cczfjdigjjxl4"; + url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20241229.165414.tar"; + sha256 = "04bw89j09fsvj69k0jn87mhb3fka4x3mjcxmalfmki263d6qmg5f"; }; packageRequires = [ ]; meta = { @@ -8243,10 +8308,10 @@ elpaBuild { pname = "stream"; ename = "stream"; - version = "2.3.0.0.20241117.211530"; + version = "2.4.0.0.20250102.122330"; src = fetchurl { - url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20241117.211530.tar"; - sha256 = "1hhvp3rikl1dv2ca090cy5jh61nq3mvxznjwz8p39y0gn6ym3x7x"; + url = "https://elpa.gnu.org/devel/stream-2.4.0.0.20250102.122330.tar"; + sha256 = "0p1cl4xl0yh3qw0r5zy37rapbzi0xav8wzhcrvm0scgsr7il5jm8"; }; packageRequires = [ ]; meta = { @@ -8285,10 +8350,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "1.1.0.20240804.74716"; + version = "1.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-1.1.0.20240804.74716.tar"; - sha256 = "1jgcs5x5rq4bd1ac2kyh9ylid9wp9c4sijxd1zch0yi2z67x8z62"; + url = "https://elpa.gnu.org/devel/svg-1.1.0.20250101.73917.tar"; + sha256 = "1sacdwkqh5vb9bnd1vmxjk35nl9rzakh5v9mpzslh2mjysx61bmm"; }; packageRequires = [ ]; meta = { @@ -8415,10 +8480,10 @@ elpaBuild { pname = "sxhkdrc-mode"; ename = "sxhkdrc-mode"; - version = "1.0.0.0.20240913.71503"; + version = "1.1.0.0.20241224.141418"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240913.71503.tar"; - sha256 = "02qgyk2f1jglwkk34sph8j1ab1rq8r6pad7ixvi9idq7ya6wzfdb"; + url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.1.0.0.20241224.141418.tar"; + sha256 = "0z1q837vpjhhbr8gi5fiwnc25bvyfgsfxa4rlq2l527d8vrn1mpl"; }; packageRequires = [ ]; meta = { @@ -8595,10 +8660,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.2.0.20241116.82753"; + version = "1.3.0.20250101.92736"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-1.2.0.20241116.82753.tar"; - sha256 = "13qakkcx260iscxa8w6160bzdxg7n0mr3dfa44jnb9l7dc5cs6vh"; + url = "https://elpa.gnu.org/devel/tempel-1.3.0.20250101.92736.tar"; + sha256 = "1jqg7k6pr088jmbvyzqwm5xyzpjlz0a4fk4z5qmrcr6hdzyjlhgi"; }; packageRequires = [ compat ]; meta = { @@ -8812,10 +8877,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.2.0.20241018.155615"; + version = "1.2.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20241018.155615.tar"; - sha256 = "02m70rh2qzv3nnrs8ykwmpn6fsd2v9lvspiwx1q0yndgvhxwg5d4"; + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20250101.73917.tar"; + sha256 = "0w93lrbnpv567j9zn1vbw5h63d331ddi6n7cnhqi4c25kx55dzpw"; }; packageRequires = [ ]; meta = { @@ -8833,10 +8898,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.1.5.0.20241130.82948"; + version = "2.7.2.0.20250101.91903"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.7.1.5.0.20241130.82948.tar"; - sha256 = "0ypb44lhdv6hnx2rzpn8746sqa0wafknkf4bjxsvlh402xfjbypq"; + url = "https://elpa.gnu.org/devel/tramp-2.7.2.0.20250101.91903.tar"; + sha256 = "04wh0g7wym62j6bdddads1j9n4kmpb1l4zc8krb47va14avbvgmx"; }; packageRequires = [ ]; meta = { @@ -8875,10 +8940,10 @@ elpaBuild { pname = "tramp-theme"; ename = "tramp-theme"; - version = "0.2.0.20221221.82451"; + version = "0.3.0.20241214.144045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar"; - sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3"; + url = "https://elpa.gnu.org/devel/tramp-theme-0.3.0.20241214.144045.tar"; + sha256 = "1fhd8pag716h7x71bz059wd6vqn4mz058yg0apfz68dlchma4zhk"; }; packageRequires = [ ]; meta = { @@ -8919,10 +8984,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.7.9.0.20241203.214158"; + version = "0.8.3.0.20250103.173148"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.7.9.0.20241203.214158.tar"; - sha256 = "0yrc8y035yxrirjnbq3hl4jb3mj5xdnv0sy6aji4pdln2ywv122d"; + url = "https://elpa.gnu.org/devel/transient-0.8.3.0.20250103.173148.tar"; + sha256 = "1fd867jcq8jh60p9y5bk06visx5hpjik78d31ayipvf1y2ijmjq2"; }; packageRequires = [ compat @@ -9237,10 +9302,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.6.0.20241109.73512"; + version = "2.4.6.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20241109.73512.tar"; - sha256 = "1qxcl0nsry3in6n301240fg8n2bvxs58fxr8cf83vbwcfkp8n7sj"; + url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250101.73917.tar"; + sha256 = "1c9rq2ija4a24ff0rysp1znnrlpch92v3qd35y49mjn0x4bn7sm8"; }; packageRequires = [ bind-key ]; meta = { @@ -9433,10 +9498,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2024.10.9.140346409.0.20241009.223438"; + version = "2025.1.1.100165202.0.20250101.82250"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2024.10.9.140346409.0.20241009.223438.tar"; - sha256 = "1zkdlq5ly9phjmg4ga1blbr184a7l3jldfpw58qx5njvyq5b3jq8"; + url = "https://elpa.gnu.org/devel/verilog-mode-2025.1.1.100165202.0.20250101.82250.tar"; + sha256 = "17q3d1nyw0szishffh0i44sm2yzfycvy6196dlwnfrbpkna9wmps"; }; packageRequires = [ ]; meta = { @@ -9455,10 +9520,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.9.0.20241130.70347"; + version = "1.10.0.20250101.92843"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.9.0.20241130.70347.tar"; - sha256 = "0xqyzmsyxrqvr1r25qyw59r5997f5ldj0c7nl8l821855dnm2c2y"; + url = "https://elpa.gnu.org/devel/vertico-1.10.0.20250101.92843.tar"; + sha256 = "1868m8ss9d9hyk55an6vmn6hb19qvvdadxn3jmngmbvxvgcsh4gm"; }; packageRequires = [ compat ]; meta = { @@ -9478,10 +9543,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.7.0.20241023.25940"; + version = "0.7.8.0.20241225.125045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20241023.25940.tar"; - sha256 = "0gvi8z5jhgy5jqp4q80ax01djzswp2ygq9rfryy8p3m3pgf36g4n"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.8.0.20241225.125045.tar"; + sha256 = "11yhjx8hk5j04wagzwxm2rsb124q0s25m5bfr2a5qpalhj7dxhzq"; }; packageRequires = [ posframe @@ -9586,10 +9651,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.3.0.0.20240425.211317"; + version = "2.3.0.0.20241225.170413"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar"; - sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz"; + url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20241225.170413.tar"; + sha256 = "0cl9ysfh9jkdk602183lbqb4xfb3z0y85ybs8ql6fl2n483n934a"; }; packageRequires = [ ]; meta = { @@ -9714,10 +9779,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.1.0.20241123.44609"; + version = "3.6.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20241123.44609.tar"; - sha256 = "0gn2z7l4fj5cff44k6xbqfbksbafm90i0wssak7c4ghai57wqqa2"; + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250101.73917.tar"; + sha256 = "05d6dbh0l7lb70rqqgqlwp1q32i4kr4lqkdgg4ngimyqnmm2xy5h"; }; packageRequires = [ ]; meta = { @@ -9757,10 +9822,10 @@ elpaBuild { pname = "window-tool-bar"; ename = "window-tool-bar"; - version = "0.2.1.0.20241024.85007"; + version = "0.2.1.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20241024.85007.tar"; - sha256 = "16226fm8hq862s9f4ja8wpkar4yp8v86pkq9kdv3mpbmw9lywq54"; + url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20250101.73917.tar"; + sha256 = "0cc1s4jrz9zy9986v27hlm6aj9iq11vd7xc4i2wymy47fkmqfbhl"; }; packageRequires = [ compat ]; meta = { @@ -9953,10 +10018,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.20.0.20240708.212415"; + version = "0.20.0.20250101.94850"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar"; - sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik"; + url = "https://elpa.gnu.org/devel/xelb-0.20.0.20250101.94850.tar"; + sha256 = "03lma8c203j736kl2pg1vmjd4iw52qg67qlb0617pr6dd7p7jr8j"; }; packageRequires = [ compat ]; meta = { @@ -10000,10 +10065,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "2.0.0.20240802.81742"; + version = "2.1.0.20241229.210720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-2.0.0.20240802.81742.tar"; - sha256 = "1x93v2x8zkr3s55c8r8lpimavqzcq0zjxshg5kif84gir10jgcdn"; + url = "https://elpa.gnu.org/devel/xr-2.1.0.20241229.210720.tar"; + sha256 = "0p7v5pl1rynhki6rx0fsxm3jnch3lspw59v9mxz86ir1w03913mm"; }; packageRequires = [ ]; meta = { @@ -10021,10 +10086,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.7.0.0.20241127.14322"; + version = "1.7.0.0.20250101.73917"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20241127.14322.tar"; - sha256 = "12983qax1jwbbcbd8zs1spi3z1hnnnmqih75dx0wy281zv1vwzp4"; + url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20250101.73917.tar"; + sha256 = "057s32ps07cnzny7zv1zp794nhwvi11zfwjbbzql38pryqrjijp4"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index ba7e41e8bf2b..0d0d5716e2ed 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -53,10 +53,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/activities-0.7.1.tar"; - sha256 = "1khhkfyy251mag5zqybsvfg3sak0aac1qlsdl1wyiin7f6sq9563"; + url = "https://elpa.gnu.org/packages/activities-0.7.2.tar"; + sha256 = "1b6d77b5h2vikfxqjlb1jx5pnij5bif788nysvvn3wlzpwdi88s0"; }; packageRequires = [ persist ]; meta = { @@ -419,10 +419,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.7"; + version = "14.0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.7.tar"; - sha256 = "1m71jr853b4d713z1k4jj73c8ba4753hv8nighx62razgmpn4ci8"; + url = "https://elpa.gnu.org/packages/auctex-14.0.8.tar"; + sha256 = "0bcjkbwhbkmm0r7pbh44j7vw9b39g2iw1jgw4sq54qp7387j6lmy"; }; packageRequires = [ ]; meta = { @@ -790,10 +790,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.4"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar"; - sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf"; + url = "https://elpa.gnu.org/packages/boxy-2.0.0.tar"; + sha256 = "1vfgwgk3vzzp2cy7n0qwhn7hzjxbp9vzxp1al1pkynv9hfs503gb"; }; packageRequires = [ ]; meta = { @@ -813,10 +813,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.6"; + version = "2.1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar"; - sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.8.tar"; + sha256 = "1r356z090dkgc7wb5qq35pkq3932rr6zy90d85jb9frxf7w1zmd7"; }; packageRequires = [ boxy @@ -1020,10 +1020,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.7.tar"; - sha256 = "03npj4a8g73dgrivjgc27w0c957naqhxq0hfzshdqci6mrq1gph3"; + url = "https://elpa.gnu.org/packages/cape-1.8.tar"; + sha256 = "18z3c3d1wbf2j40rym74918hxccmi84rbqkzc2g73jbigp78kyq4"; }; packageRequires = [ compat ]; meta = { @@ -1398,10 +1398,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.0.0"; + version = "30.0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar"; - sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl"; + url = "https://elpa.gnu.org/packages/compat-30.0.2.0.tar"; + sha256 = "0pizq8vwfqls04in95rpnfwv4xc1r2qjpf41g6bjy826i53cfdx0"; }; packageRequires = [ seq ]; meta = { @@ -1441,10 +1441,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.8.tar"; - sha256 = "0k3k1jmwdw4w8rr5z2030ba37mcia2zghh6p4c36ck51hwvfkb8w"; + url = "https://elpa.gnu.org/packages/consult-1.9.tar"; + sha256 = "0qz8l962995znf9lhgy8hdd9z78bdhb8m95dxj1g3266jsgjf8sv"; }; packageRequires = [ compat ]; meta = { @@ -1554,10 +1554,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-1.5.tar"; - sha256 = "0m80slhpr9xd57b3nvrqgfxm44851v9gfcy8ky3d3v2g5i2mrm6x"; + url = "https://elpa.gnu.org/packages/corfu-1.6.tar"; + sha256 = "1wx7hjvccb2jss4k0vcmmdxkyivs2qnzai6xw2l1fgdan9ngg89n"; }; packageRequires = [ compat ]; meta = { @@ -1814,10 +1814,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.17.0"; + version = "0.19.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.17.0.tar"; - sha256 = "113lmy0q1yk81cfi9dbig8p9bmhyqy6w1bvhn91m79my05ny2rxd"; + url = "https://elpa.gnu.org/packages/dape-0.19.0.tar"; + sha256 = "11hs0cnzyp75gmz32mqplaknf4lq0zf9zp07h1rhlvz31aacvrqh"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1901,10 +1901,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.42"; + version = "0.43"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.42.tar"; - sha256 = "0n0kvkyzggn8q72dpy6c7rsjwn1rjx0r33y5jc080j7sw85xpigg"; + url = "https://elpa.gnu.org/packages/debbugs-0.43.tar"; + sha256 = "1jzdr7bp48incg1bdnq4s1ldnyp6hncz0mydy0bizk3c68chsls5"; }; packageRequires = [ soap-client ]; meta = { @@ -2045,6 +2045,28 @@ }; } ) { }; + dicom = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dicom"; + ename = "dicom"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dicom-0.5.tar"; + sha256 = "1qz4zhq0fcfl7l42qib60j2dzm1vp2vmwfhm48s0ia6dgdkvad3x"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dicom.html"; + license = lib.licenses.free; + }; + } + ) { }; dict-tree = callPackage ( { elpaBuild, @@ -2539,10 +2561,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20241123"; + version = "20241223"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20241123.tar"; - sha256 = "1bb2134jggj4xg49cwy8ivfb12yafxyy2p5k4rca9an3cr4s8ci7"; + url = "https://elpa.gnu.org/packages/eev-20241223.tar"; + sha256 = "0rp7b3sfh94zyah303sk43mfdbzcz6p20dqarkzbsgin3n77ara8"; }; packageRequires = [ ]; meta = { @@ -2689,10 +2711,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisa-1.1.3.tar"; - sha256 = "0370gvj3r701i2acp3wq705a9n534g719nzz8bg9a4lry76f2crv"; + url = "https://elpa.gnu.org/packages/elisa-1.1.4.tar"; + sha256 = "1v5y0piqz31dx38mv217l5z4xn6hnggznmrcxd2ffs0xdvr9iv3s"; }; packageRequires = [ async @@ -2740,10 +2762,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.13.0.tar"; - sha256 = "0wfn8fv124qxf9yxl4lsa3hwlicmaiv2zzn8w4vhmlni1kf37nlw"; + url = "https://elpa.gnu.org/packages/ellama-0.13.1.tar"; + sha256 = "1hf9lqjcg33xahz8i5ng123z6yljmwm3zw15n96x83x0szxi1wl1"; }; packageRequires = [ compat @@ -2876,10 +2898,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "20.2"; + version = "21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-20.2.tar"; - sha256 = "0amc956amyfsjlq5aqc7nk2cs2ph2zcpci5wkms6w973wx67z2j6"; + url = "https://elpa.gnu.org/packages/emms-21.tar"; + sha256 = "188rij39qqaya7hk0p05ygcw5vlha7qd6pm4ws6nfw7g0nv1rbcc"; }; packageRequires = [ cl-lib @@ -3801,10 +3823,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.11.18"; + version = "0.12.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.11.18.tar"; - sha256 = "122mvjcbvi7dzggx1dl02iw9jl0h33l8ka4mzvlr6sl0wwwzfpr8"; + url = "https://elpa.gnu.org/packages/greader-0.12.6.tar"; + sha256 = "0xv814p7cdf2wj7qdj9cpz3blnkcd8b6sjk2jajym5hilmr9a9b5"; }; packageRequires = [ compat @@ -4422,10 +4444,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.10.tar"; - sha256 = "19l1wcrv610l6alb9xzyfmdkmnzgcf60z3557q4dkgvz35959p4y"; + url = "https://elpa.gnu.org/packages/jinx-1.11.tar"; + sha256 = "0g0iys02k488lbkd7a8qn3hwcmfhmyfp8v3mm07z3zsjhlqw0m57"; }; packageRequires = [ compat ]; meta = { @@ -4873,10 +4895,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.19.1"; + version = "0.20.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.19.1.tar"; - sha256 = "03f8yvnq1n2pns62iji2iz50f30wxw50n9a6cxgd9p2vkd4pjb0g"; + url = "https://elpa.gnu.org/packages/llm-0.20.0.tar"; + sha256 = "12a6z2knsxp8jy0v9hsfsb7kdzyj6pnq5h58vnkrizd95zp6zf91"; }; packageRequires = [ plz @@ -5067,10 +5089,10 @@ elpaBuild { pname = "m-buffer"; ename = "m-buffer"; - version = "0.16"; + version = "0.16.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar"; - sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4"; + url = "https://elpa.gnu.org/packages/m-buffer-0.16.1.tar"; + sha256 = "1iq7nld1i8v0da1ajhvfdarx4bx3wnwgz5lhb78fcnsq8zb6cp5y"; }; packageRequires = [ seq ]; meta = { @@ -5110,10 +5132,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.7.tar"; - sha256 = "1bwbkz71w81zcqsydvqic2xri52pm1h9nac8i7i04nl5b98pszkk"; + url = "https://elpa.gnu.org/packages/marginalia-1.8.tar"; + sha256 = "0q8mflfsl4vj2r2m47jgm5hrg3a4k5pildb53vlgm5k9wb4sd7md"; }; packageRequires = [ compat ]; meta = { @@ -5185,6 +5207,27 @@ }; } ) { }; + matlab-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "matlab-mode"; + ename = "matlab-mode"; + version = "6.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/matlab-mode-6.3.tar"; + sha256 = "0m3h60629p9rv8k2fk23iwfdgzsdmlk78y1j83xz5m53z7vl3a7m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/matlab-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; mct = callPackage ( { elpaBuild, @@ -5943,10 +5986,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.2.tar"; - sha256 = "1iyfnvwqwn8y4bkv25zw15y8yy5dm89kyk7wlxw0al22bhfc2cm7"; + url = "https://elpa.gnu.org/packages/orderless-1.3.tar"; + sha256 = "1gh2xw34adk5q6v9sz42j5mwyjjp1yix70jvjylnapwsjjsjm5qk"; }; packageRequires = [ compat ]; meta = { @@ -5964,10 +6007,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.16"; + version = "9.7.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.16.tar"; - sha256 = "1d6vxd7ssfb1v00a37dr723v9cg8i8v78lcymqndqhy6f2ji1f06"; + url = "https://elpa.gnu.org/packages/org-9.7.19.tar"; + sha256 = "0v7ridhsz12iwznk8165ll61i1w1avhxfrq3p82p9r6ir2xdan1g"; }; packageRequires = [ ]; meta = { @@ -6056,10 +6099,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-1.5.tar"; - sha256 = "08s253r3z5r37swlsgrp97ls7p3bdr4hr2xvyb1pm57j7livv74b"; + url = "https://elpa.gnu.org/packages/org-modern-1.6.tar"; + sha256 = "1fmmblqs6v52690fvky3xq48m5a3xh8xrl7j8pqw6hc06igm4m5q"; }; packageRequires = [ compat ]; meta = { @@ -6100,10 +6143,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar"; - sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2"; + url = "https://elpa.gnu.org/packages/org-real-1.0.11.tar"; + sha256 = "1mm2p6487m4sr8zvj7xqryvicvj0qbv7as39hxh1ad7yhfdhgpvw"; }; packageRequires = [ boxy @@ -6233,10 +6276,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-1.4.tar"; - sha256 = "0cix4jn3919xnlsj85l4m83znkqf4m2988zzqwcsvvvjrmgccanh"; + url = "https://elpa.gnu.org/packages/osm-1.5.tar"; + sha256 = "1hgr1gfkii75nmfsz3nvn5hv9x9jg09as7k12rr7vr9k0fs0j4hk"; }; packageRequires = [ compat ]; meta = { @@ -6340,10 +6383,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.2.1"; + version = "0.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar"; - sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf"; + url = "https://elpa.gnu.org/packages/parser-generator-0.2.4.tar"; + sha256 = "01b5bwh484fpicv0g2z64694pjkhrcqz9f8jpq6hk41kzhvr23m1"; }; packageRequires = [ ]; meta = { @@ -6830,10 +6873,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-1.1.0.tar"; - sha256 = "0hs65y2avl8w5g4zd68sdg4rl4q15ac53xlbc4qrfjynlajma6mm"; + url = "https://elpa.gnu.org/packages/pulsar-1.2.0.tar"; + sha256 = "03bx06fa7md78xrn10kigrf3p8pm07lxpw70wbhfqgq1b3zr46rl"; }; packageRequires = [ ]; meta = { @@ -7325,10 +7368,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-2.0.tar"; - sha256 = "0r89b5yk5lp92k4gnr0sx6ccilqzpv6kd5csqhxydk0xmqh8rsff"; + url = "https://elpa.gnu.org/packages/relint-2.1.tar"; + sha256 = "0ikml87y0k85qd92m3l1gkzjd9ng3mhjfk19w15ln0w801351cq0"; }; packageRequires = [ xr ]; meta = { @@ -7960,6 +8003,28 @@ }; } ) { }; + speedrect = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "speedrect"; + ename = "speedrect"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/speedrect-0.7.tar"; + sha256 = "0nxwwd12qqyxq1fg8n6miyx63fp29cvpfp8w33zmf9dhkcjwyfd1"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/speedrect.html"; + license = lib.licenses.free; + }; + } + ) { }; spinner = callPackage ( { elpaBuild, @@ -8101,10 +8166,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/standard-themes-2.1.0.tar"; - sha256 = "0x7fphd36kwg4vfwix5rq7260xl6x6cjfwsq11rj4af30sm4hlfn"; + url = "https://elpa.gnu.org/packages/standard-themes-2.2.0.tar"; + sha256 = "0qdld75vcfhsn2l0xips52vrlp5q7ss3973hd722h2gp1wddn5f7"; }; packageRequires = [ ]; meta = { @@ -8122,10 +8187,10 @@ elpaBuild { pname = "stream"; ename = "stream"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.3.0.tar"; - sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay"; + url = "https://elpa.gnu.org/packages/stream-2.4.0.tar"; + sha256 = "16wl1q7wikk0wyzfwjz16azq025dx4wdh1j9q0nadi68ygxi172b"; }; packageRequires = [ ]; meta = { @@ -8294,10 +8359,10 @@ elpaBuild { pname = "sxhkdrc-mode"; ename = "sxhkdrc-mode"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; - sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj"; + url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.1.0.tar"; + sha256 = "00mzhxrlcbswsv3jysgqniq02inakz7j5a2hx2w83is5rbmb9bhc"; }; packageRequires = [ ]; meta = { @@ -8449,10 +8514,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-1.2.tar"; - sha256 = "0lvdd7lvdx4yf0zhrv380y5q3zvvk7gsxjgxj2c40np86c4q2q7m"; + url = "https://elpa.gnu.org/packages/tempel-1.3.tar"; + sha256 = "0fivsldisk17a1vbzx91kmvsd85vl0dnih77pqnzriyqs8dl1wdm"; }; packageRequires = [ compat ]; meta = { @@ -8688,10 +8753,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.1.5"; + version = "2.7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.7.1.5.tar"; - sha256 = "11a2zyk0d1y9bxhdqfzcx4ynazfs6hb3mdgpz5kp9p3lk8l6bz5g"; + url = "https://elpa.gnu.org/packages/tramp-2.7.2.tar"; + sha256 = "1m1ar9k5f4yx98m8v0y8rm7hq5dwjafb096gmdg6mz57k1k3y6vl"; }; packageRequires = [ ]; meta = { @@ -8730,10 +8795,10 @@ elpaBuild { pname = "tramp-theme"; ename = "tramp-theme"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar"; - sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm"; + url = "https://elpa.gnu.org/packages/tramp-theme-0.3.tar"; + sha256 = "1v9265cnk858jl522zcnqf2cv3f3g93f0mk52plz3n4a8k5nlfa7"; }; packageRequires = [ ]; meta = { @@ -8774,10 +8839,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.7.9"; + version = "0.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.7.9.tar"; - sha256 = "07d5pzd7nalnjxn6wpj6vpfg8pldnwh69l85immmiww03vl8ngrf"; + url = "https://elpa.gnu.org/packages/transient-0.8.3.tar"; + sha256 = "0cx9h7knkyzalkyvbvl762mnl2mslcfxh899mf5wgqfavwkzgqp7"; }; packageRequires = [ compat @@ -9287,10 +9352,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2024.10.9.140346409"; + version = "2025.1.1.100165202"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2024.10.9.140346409.tar"; - sha256 = "1hm0id8sivb7znvw1f63asbs4sf4v6hkimr0j8bqqda3h9sz197l"; + url = "https://elpa.gnu.org/packages/verilog-mode-2025.1.1.100165202.tar"; + sha256 = "1cgv081dlarc0b4s6rjkqbvs4fa9npyq9pjxj7173vmgkfdwmkp5"; }; packageRequires = [ ]; meta = { @@ -9309,10 +9374,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.9"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.9.tar"; - sha256 = "12aiqxsar86xlmsfzvilza10wf184nwhg218bv6bip7v51ikh37y"; + url = "https://elpa.gnu.org/packages/vertico-1.10.tar"; + sha256 = "1mka141i5dmdw8c8dsxgxwqfr78s3gjy4rrra8qd5b8qrhv797dx"; }; packageRequires = [ compat ]; meta = { @@ -9332,10 +9397,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar"; - sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.8.tar"; + sha256 = "08f1fmr0s9kx3f7ivh1isdik04cq87j69wgl5ir0gppa39ip0dqw"; }; packageRequires = [ posframe @@ -9853,10 +9918,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-2.0.tar"; - sha256 = "1y5pcrph6v8q06mipv3l49qhw55yvvb1nnq0817bzm25k0s3z70v"; + url = "https://elpa.gnu.org/packages/xr-2.1.tar"; + sha256 = "1yssl7av2rpanzmm93iw74acnb3pbrnh0b51kr64wcj6hwb26cy2"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix index 59be7f543d1c..bb6ad95c94b5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix @@ -3,7 +3,7 @@ codeium, fetchFromGitHub, melpaBuild, - substituteAll, + replaceVars, gitUpdater, }: @@ -19,8 +19,7 @@ melpaBuild { }; patches = [ - (substituteAll { - src = ./0000-set-codeium-command-executable.patch; + (replaceVars ./0000-set-codeium-command-executable.patch { codeium = lib.getExe' codeium "codeium_language_server"; }) ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 317ed3f73f28..6375059ddef7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -956,11 +956,18 @@ let # missing optional dependencies conda = addPackageRequires super.conda [ self.projectile ]; - consult-gh = super.consult-gh.overrideAttrs (old: { - propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ]; - }); + # needs network during compilation, also native-ice + consult-gh = ignoreCompilationError ( + super.consult-gh.overrideAttrs (old: { + propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ]; + }) + ); - consult-gh-forge = buildWithGit super.consult-gh-forge; + # needs network during compilation + consult-gh-embark = ignoreCompilationError super.consult-gh-embark; + + # needs network during compilation + consult-gh-forge = ignoreCompilationError (buildWithGit super.consult-gh-forge); counsel-gtags = ignoreCompilationError super.counsel-gtags; # elisp error @@ -1398,7 +1405,7 @@ let org-gtd = ignoreCompilationError super.org-gtd; # elisp error # needs newer org than the Eamcs 29.4 builtin one - org-link-beautify = addPackageRequires super.org-link-beautify [ self.org ]; + org-link-beautify = addPackageRequires super.org-link-beautify [ self.org self.qrencode ]; # TODO report to upstream org-kindle = addPackageRequires super.org-kindle [ self.dash ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index c2e25c45e7e4..c16a6ef0d748 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -177,10 +177,10 @@ elpaBuild { pname = "apropospriate-theme"; ename = "apropospriate-theme"; - version = "0.2.0.0.20241118.190153"; + version = "0.2.0.0.20241215.141144"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20241118.190153.tar"; - sha256 = "0nqnf57bf21wg2vlw85msg927618hhsn4qfwd60vrx70260432kf"; + url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20241215.141144.tar"; + sha256 = "0hr961s3s9n9an63yxkxkryas0vr0cw9g07ir8igyan6b8b2didb"; }; packageRequires = [ ]; meta = { @@ -220,10 +220,10 @@ elpaBuild { pname = "auto-dim-other-buffers"; ename = "auto-dim-other-buffers"; - version = "2.1.1.0.20240515.131159"; + version = "2.2.1.0.20241219.184527"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.1.1.0.20240515.131159.tar"; - sha256 = "1dp3q1hrdcvi82pcj5hxha9yyy9lkdqs8kxfq6v7lq716wxkwxfl"; + url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.1.0.20241219.184527.tar"; + sha256 = "0596jw2qxk79z26blq7vlch7wszv39f84kpi7gwrbad0jyjcryfw"; }; packageRequires = [ ]; meta = { @@ -284,10 +284,10 @@ elpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "3.1.1.0.20241118.194353"; + version = "3.2.1snapshot0.20250101.145820"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20241118.194353.tar"; - sha256 = "10cirfnwz34yc7glf1xzshq3926jdwdf3s7bdarykrkxmsrha4f7"; + url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20250101.145820.tar"; + sha256 = "11a2fijxi102mnm63vbxgrrw2rr9nf5rhlfal3766m8rv2drwhd7"; }; packageRequires = [ ]; meta = { @@ -544,10 +544,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.16.1.0.20241203.160720"; + version = "1.16.1.0.20250103.102622"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.1.0.20241203.160720.tar"; - sha256 = "0b6nqhg5c0ny8ilm4653c7pd34aj02bh6ya9bzc9swdpyq7pwnqr"; + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.1.0.20250103.102622.tar"; + sha256 = "0xxmarmq2mja45yb4a4aqddbcnhi91dcdlw0xq5j5ab3k9grmmpa"; }; packageRequires = [ clojure-mode @@ -573,10 +573,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.20.0snapshot0.20241125.112305"; + version = "5.20.0snapshot0.20241211.152233"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20241125.112305.tar"; - sha256 = "0hh17w63j5x4687kbd2vmlj9qs468ivq54mwwcm6p43wr7rvk2cj"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20241211.152233.tar"; + sha256 = "0m6bafwl3687ccl815q70bw4q8k3w12vkfl24g5x9rn6dn44ppxx"; }; packageRequires = [ ]; meta = { @@ -638,10 +638,10 @@ elpaBuild { pname = "consult-flycheck"; ename = "consult-flycheck"; - version = "1.0.0.20241114.112007"; + version = "1.0.0.20250101.91433"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20241114.112007.tar"; - sha256 = "1jzli50sjr8pv2j9qg7glxdgm54sx2yw6xr7ka738gisa1r0iscl"; + url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20250101.91433.tar"; + sha256 = "05ms0zhswsdlvvrz71md4nsqisshar284xn7idw7z01ddd05rjmb"; }; packageRequires = [ consult @@ -774,10 +774,10 @@ elpaBuild { pname = "d-mode"; ename = "d-mode"; - version = "202408131340.0.20241126.105644"; + version = "202408131340.0.20241225.185152"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20241126.105644.tar"; - sha256 = "11hc3dyxyr1pcq25jvw9x3ys4v73rbqw9p19s4i59p9mdb0bnxpy"; + url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20241225.185152.tar"; + sha256 = "08wlsp1mzsn0xprslwmnhxzj58yy35vjy09l70dxz5pyxk3vg2vd"; }; packageRequires = [ ]; meta = { @@ -880,10 +880,10 @@ elpaBuild { pname = "diff-ansi"; ename = "diff-ansi"; - version = "0.2.0.20240818.235912"; + version = "0.2.0.20241208.51148"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240818.235912.tar"; - sha256 = "085h7xb75dkdmsnc572rmqgzw1pp4jmxcfrr3nnpbvirgjij8pma"; + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20241208.51148.tar"; + sha256 = "08fvdzs2qmd4mbcz52bhmng2wz2pxn9x06w5sg9fjq744005p7dd"; }; packageRequires = [ ]; meta = { @@ -902,10 +902,10 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.0.53.0.20230519.150010"; + version = "2.0.53.0.20250101.212150"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20230519.150010.tar"; - sha256 = "0n73giyvg244s0cxfrkc3j0jrq20bs1zili6liab0s3ks02kvqdg"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250101.212150.tar"; + sha256 = "0q4lh8xz2922lsgjb58c116sndcvy2fc0clws6bp1418fsyjxa9l"; }; packageRequires = [ transient ]; meta = { @@ -923,10 +923,10 @@ elpaBuild { pname = "doc-show-inline"; ename = "doc-show-inline"; - version = "0.1.0.20240616.234552"; + version = "0.1.0.20241208.50508"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20240616.234552.tar"; - sha256 = "0p39glahjqm2fv8xcnwyhcnzsf53g15013jbnj1lh7610bdgfk6g"; + url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20241208.50508.tar"; + sha256 = "1k98b8d0bxiz7i4n4r46zxy14jszskfmvxavwriig59p2g5gx1yb"; }; packageRequires = [ ]; meta = { @@ -965,10 +965,10 @@ elpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.8.2.0.20241102.130126"; + version = "1.8.2.0.20241217.214522"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241102.130126.tar"; - sha256 = "01f3g7cy9snm4f2b2rx7zd82kwxzlf9g0wapwa83k3i60p23rf5s"; + url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241217.214522.tar"; + sha256 = "0dizqwzgygkim66lxkxpwcidhhi7ppwazi57nqkahyd3n03ka2f9"; }; packageRequires = [ ]; meta = { @@ -1008,10 +1008,10 @@ elpaBuild { pname = "dslide"; ename = "dslide"; - version = "0.5.5.0.20241128.111432"; + version = "0.6.2.0.20250102.81901"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.5.0.20241128.111432.tar"; - sha256 = "1d2rsqzn8w6w3qvsfsgpmjwn53nsj30jivli02d7n24q30pxzpv6"; + url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.6.2.0.20250102.81901.tar"; + sha256 = "18ggnfj9adlrhni2mb6f1ygc0mf7q8xm99729cbvp2k6l7yidxxc"; }; packageRequires = [ ]; meta = { @@ -1084,6 +1084,48 @@ }; } ) { }; + eglot-inactive-regions = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eglot-inactive-regions"; + ename = "eglot-inactive-regions"; + version = "0.6.3.0.20241217.45248"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions-0.6.3.0.20241217.45248.tar"; + sha256 = "1kf84wzfdysskmxjv45c1vdp5vpg7issk92gvcvrw59afsv25cza"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions.html"; + license = lib.licenses.free; + }; + } + ) { }; + eldoc-diffstat = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eldoc-diffstat"; + ename = "eldoc-diffstat"; + version = "1.0.0.20241214.213403"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/eldoc-diffstat-1.0.0.20241214.213403.tar"; + sha256 = "10rjz33lhsp61pjdj64k0y9wh9nlfnz1w89xck0gfp2p42kya87n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/eldoc-diffstat.html"; + license = lib.licenses.free; + }; + } + ) { }; elixir-mode = callPackage ( { elpaBuild, @@ -1180,10 +1222,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.15.0.0.20241006.175409"; + version = "1.15.0.0.20241229.162330"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20241006.175409.tar"; - sha256 = "0w752hhnpkfa5wqm1rk6nzq6n9y8c8mjzjhzri91l06jngpl6ckd"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20241229.162330.tar"; + sha256 = "03l1cg2d4zdh59cf93cvc3i5daq2pw7j8hw7kbdxjy5cl7136d32"; }; packageRequires = [ cl-lib @@ -1255,10 +1297,10 @@ elpaBuild { pname = "evil-escape"; ename = "evil-escape"; - version = "3.16.0.20231122.211452"; + version = "3.16.0.20241212.131839"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-escape-3.16.0.20231122.211452.tar"; - sha256 = "1yv77vxvyl41795h7ixl6fhm43n7q6xqkqp1yaqgv5g9iymdj1s0"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-escape-3.16.0.20241212.131839.tar"; + sha256 = "18j653kymcvxdr0n0vibl091p2zwdzgqymw3g778visshxgk11mb"; }; packageRequires = [ cl-lib @@ -1407,10 +1449,10 @@ elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "3.0.4.0.20241111.120111"; + version = "4.0.1.0.20241205.72440"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20241111.120111.tar"; - sha256 = "1jv7rs102i00kwdkj1n3l0j9as0kbrylhkkn2rrgwv9b97lmlirs"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-4.0.1.0.20241205.72440.tar"; + sha256 = "0hi6p25pbn2xh7jzglmpvs5nvrlzi7b4gjm37q1vbyiji9k5xfci"; }; packageRequires = [ ]; meta = { @@ -1450,10 +1492,10 @@ elpaBuild { pname = "evil-numbers"; ename = "evil-numbers"; - version = "0.7.0.20241204.12906"; + version = "0.7.0.20241208.52322"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20241204.12906.tar"; - sha256 = "1r4ic5db8vl3mslp48w8lqx904raxi8lzp512jcjv21vs36gjl97"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20241208.52322.tar"; + sha256 = "1a5lw59lfavfqnaxay4c4j7246q4i3w53ra9gc44qr94432nd1q9"; }; packageRequires = [ evil ]; meta = { @@ -1610,10 +1652,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "35.0snapshot0.20241130.150233"; + version = "35.0snapshot0.20250104.70510"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20241130.150233.tar"; - sha256 = "08viqbba50alfj3783ykymjqwpi08si6bi411sm29gagga1cjxr6"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250104.70510.tar"; + sha256 = "1p186zsjjhaz99776zgys9zxx9fk01mllv9g6bsmzd6srmcf9bc5"; }; packageRequires = [ ]; meta = { @@ -1856,10 +1898,10 @@ elpaBuild { pname = "geiser-chicken"; ename = "geiser-chicken"; - version = "0.17.0.20241204.11932"; + version = "0.17.0.20241204.144210"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20241204.11932.tar"; - sha256 = "1l95d72wl74mlfa50m9m999skj993vqdmm13qm42n0lp0y9ndvyf"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20241204.144210.tar"; + sha256 = "0lss1nz7kdbpmky96r10gvsbnjxxnqlymz0d0579ggvf9hi1cj66"; }; packageRequires = [ geiser ]; meta = { @@ -2090,10 +2132,10 @@ elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.4.8.0.20241115.104152"; + version = "0.4.10.0.20241211.105407"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.8.0.20241115.104152.tar"; - sha256 = "143pmwp5g2wzmmhmbwc1q6hhf86j1cywi8x2hzvlq0p5mhkkilr1"; + url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.10.0.20241211.105407.tar"; + sha256 = "0wvqk279qfdvwk7k27lzw9063x7w6jypprlh1rgj6xlhnn3kv9y8"; }; packageRequires = [ compat @@ -2264,10 +2306,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.6.0.20241202.163036"; + version = "0.9.7.0.20250103.103741"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.6.0.20241202.163036.tar"; - sha256 = "0zlfrnp01hb6syrkgkwfi1hjxm9l4j9sqrwn7a8nmk5wlw4bi6xm"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250103.103741.tar"; + sha256 = "00d22c6hgm8cr2wfqk4s2xcqblljzcv4iyrvbcjbgipr2nynb6iw"; }; packageRequires = [ compat @@ -2288,10 +2330,10 @@ elpaBuild { pname = "graphql-mode"; ename = "graphql-mode"; - version = "1.0.0.0.20241020.75405"; + version = "1.0.0.0.20241206.72535"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20241020.75405.tar"; - sha256 = "0bds1zv0syg1jfdak2hk3kank4c532r6ki095wamxy06rwdbm2il"; + url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20241206.72535.tar"; + sha256 = "06pn5rk0mkswrx2sd589hbqir1wkczjwy453ssk0az4z49g85ks9"; }; packageRequires = [ ]; meta = { @@ -2438,10 +2480,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1.0.20241108.150811"; + version = "1.0.20250101.102728"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20241108.150811.tar"; - sha256 = "1ycbcwhj9j77jgpb3ag7hy8474qdj4rzzg7z5z79f0fqvlnv94m7"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250101.102728.tar"; + sha256 = "15m1qdcb899wmdx7ih53c5ndlvv3q5fny885l287sf17f6p563k7"; }; packageRequires = [ ]; meta = { @@ -2461,10 +2503,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.0.20241204.51511"; + version = "4.0.0.20250104.104508"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20241204.51511.tar"; - sha256 = "1dzc1jg6p9r589mzwdzhlhj58239ssy85mz27kwr7yyg36cz3m3l"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250104.104508.tar"; + sha256 = "0xcsfbzkwip67m5lpjwi8a08hfm8nc5xwgvz18d7685gsmizc6hs"; }; packageRequires = [ helm-core @@ -2486,10 +2528,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.0.20241204.51511"; + version = "4.0.0.20250104.104508"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20241204.51511.tar"; - sha256 = "1xvx1x6p7r1ak40n3740q9iyah2d1npqg7aw1zybshcrai5bm9jm"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250104.104508.tar"; + sha256 = "02silp1myffcm3nwrakfj8zn3c5x8msmmyrqx1id2r6wwki9f8pz"; }; packageRequires = [ async ]; meta = { @@ -2549,10 +2591,10 @@ elpaBuild { pname = "hl-block-mode"; ename = "hl-block-mode"; - version = "0.2.0.20240422.12652"; + version = "0.2.0.20241208.45934"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20240422.12652.tar"; - sha256 = "1j3fp1p066j9b67hna6mh7pb96kld9nc0mkv8jl0qdwi95aah81q"; + url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20241208.45934.tar"; + sha256 = "0s9x68h46qf49xg7fd7gbrr78l7zc53hnprq6hxhzlw5fara7xsn"; }; packageRequires = [ ]; meta = { @@ -2619,10 +2661,10 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.5pre0.20241106.231359"; + version = "0.6pre0.20241222.235250"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241106.231359.tar"; - sha256 = "11b3dvwzrsgg2nj3kasgrz5bwhd2i3ig4v9blzlzhyybw6wy0i1f"; + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20241222.235250.tar"; + sha256 = "0a9z9kbnlzbv21w62zyw3mpbvjfnl5vhjmlpq65w7cc4d1qd2jp5"; }; packageRequires = [ compat @@ -2764,10 +2806,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.8.1.0.20240925.4944"; + version = "2.8.1.0.20241220.25141"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240925.4944.tar"; - sha256 = "1wl5nzrbafvmvvvq477lsvc14pvlmq8x9j1cqbd0cj11lvn4k1qb"; + url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20241220.25141.tar"; + sha256 = "0z3vbdb1df0vwjm2lk6bk11c0afg8w6p5n2x8q4wgmwqyp3h3gb2"; }; packageRequires = [ ]; meta = { @@ -2895,10 +2937,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "1.0.1.0.20241120.85729"; + version = "1.0.2.0.20241213.162017"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.1.0.20241120.85729.tar"; - sha256 = "0a6xi5zcq1nfbsjqk84x6avlrzbjdh6fbq1h6jkqcczy7mm5rg5h"; + url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.2.0.20241213.162017.tar"; + sha256 = "09l2awhz4362g03qnpsy4813afjabm2dqh8g3ma354k7ql8rr95h"; }; packageRequires = [ ]; meta = { @@ -3003,10 +3045,10 @@ elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.4.0.20241025.145629"; + version = "0.9.4.0.20241228.221506"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241025.145629.tar"; - sha256 = "1xbi45ymsqc2vbhl1s3wphirgqz5ky9880fzr949bhd0ff18bw6x"; + url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241228.221506.tar"; + sha256 = "0yza9ms8i3nq4fh42s475r0m77b2phq8sx41p6irywi0clc33m0y"; }; packageRequires = [ cl-lib @@ -3033,10 +3075,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.1.2.0.20241102.130025"; + version = "4.2.0.0.20250101.180326"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.2.0.20241102.130025.tar"; - sha256 = "1y3fr2qj8a1h7hkrh47zshbmrcfxhw6i8wiqcrrba7ypnas53gcg"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.2.0.0.20250101.180326.tar"; + sha256 = "1w6yfwsy4i1wj9wm7yk7zlxkqsws1g6ql22rw8cc93hhp9rf3a57"; }; packageRequires = [ compat @@ -3064,10 +3106,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.1.2.0.20241102.130025"; + version = "4.2.0.0.20250101.180326"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.2.0.20241102.130025.tar"; - sha256 = "1cnpklpsvbsi1wsmfbp5m8379cbr6jdifxm07zj4hnvi8lyr49vn"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.2.0.0.20250101.180326.tar"; + sha256 = "0wyh9fvgnbn35nak6f3v8651j33sz929xwvkqgyrbicxwdwxinbr"; }; packageRequires = [ compat @@ -3089,10 +3131,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.7alpha0.20241203.113852"; + version = "2.7alpha0.20241210.10425"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20241203.113852.tar"; - sha256 = "14kkg7wj6qkq84jsa5cdwc7i7lqvilx21nb9lyddqxqxm8h7sld8"; + url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20241210.10425.tar"; + sha256 = "1rlja17nqr9ly5mab5824dc97w7sgr45adrfhn5li79g89hazd3n"; }; packageRequires = [ ]; meta = { @@ -3113,10 +3155,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.7.0.20241202.183936"; + version = "1.1.8.0.20241223.104057"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.7.0.20241202.183936.tar"; - sha256 = "08683fah6xkfzgxi6si4qgl4mxccczj4dcaivif1qlhfrc3bh66f"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.8.0.20241223.104057.tar"; + sha256 = "13iyzv0gyad07215zvvs9q52ikqf97qn851qgjqqhq9k4p07a22q"; }; packageRequires = [ persist @@ -3189,10 +3231,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20241203.160407"; + version = "1.5.0.0.20241224.211501"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20241203.160407.tar"; - sha256 = "0a3zdx91j5q0mllm71951392hgnn5q9l960qs2lazs8plpv4pn9f"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20241224.211501.tar"; + sha256 = "1xrq21awlf12ki7rdsm6n37hg4m1jjfjz8n0m2193jml94wc4cf8"; }; packageRequires = [ ]; meta = { @@ -3448,10 +3490,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.6.0.20241029.204012"; + version = "0.6.0.20241207.74256"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20241029.204012.tar"; - sha256 = "12pfmv5ns5igdvc06glcc8nxqcj7lwjqc3s86720ys57y4py566w"; + url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20241207.74256.tar"; + sha256 = "0i9ii3ngimx1l8s4pq2zn73lnry1npsbrsxzn92gwayj0sm77bkp"; }; packageRequires = [ org ]; meta = { @@ -3881,10 +3923,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.26.1.0.20241024.124149"; + version = "1.26.1.0.20250103.15745"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20241024.124149.tar"; - sha256 = "0h5lzvsssk0nf3g408a7jg25crglsjkhcfp1ckjnzpgiwf59i6w8"; + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250103.15745.tar"; + sha256 = "0ls4wpcn6lk5qn7n7gamk9sx6fm35cdbrv96pzi6srf3q1r71wpr"; }; packageRequires = [ ]; meta = { @@ -3923,10 +3965,10 @@ elpaBuild { pname = "popup"; ename = "popup"; - version = "0.5.9.0.20240721.5155"; + version = "0.5.9.0.20250101.4328"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20240721.5155.tar"; - sha256 = "11ay4yknbc6dy7c08dcaz4sy1ly98m0ghchif0m2mm72s2hgw7g7"; + url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20250101.4328.tar"; + sha256 = "0qgkwd0kbkifkpfv0gznd4n81xhf62q9s0bd0831yp1mkxd9y03x"; }; packageRequires = [ ]; meta = { @@ -4008,10 +4050,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20241129.85359"; + version = "1.0.20250103.151851"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241129.85359.tar"; - sha256 = "0j6hs2wpaknzprcm18y1ayqjcr2sl0z22fhw1yla5rv74lyqzglx"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250103.151851.tar"; + sha256 = "03m0ky98s647ajrjf85i9zvqwmwh4l33rdywbcc5vg516hgsnh0d"; }; packageRequires = [ ]; meta = { @@ -4071,10 +4113,10 @@ elpaBuild { pname = "recomplete"; ename = "recomplete"; - version = "0.2.0.20240616.234552"; + version = "0.2.0.20241208.45418"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20240616.234552.tar"; - sha256 = "0gkd3g1p6i4l7s6gqjsdj20m3y8n75wlcfw6xii0ka7n8j8dmrz4"; + url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20241208.45418.tar"; + sha256 = "1pflxqh7ng3khkmn4g760k8v1amd9x18i452cxd5iwfq1cb9l9f4"; }; packageRequires = [ ]; meta = { @@ -4092,10 +4134,10 @@ elpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "0.8.0.20241106.203153"; + version = "0.8.0.20241204.105138"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241106.203153.tar"; - sha256 = "1gni5f8x8d6m063k9bgaqah80w2hnb12d7qwdw1ai0xg7jb92vp7"; + url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241204.105138.tar"; + sha256 = "1j78naw4jikh7nby67gdbx9banchmf1q5fysal1328gxnyqknmzi"; }; packageRequires = [ ]; meta = { @@ -4224,10 +4266,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "94.0.0.20240926.92457"; + version = "95.0.0.20250102.95738"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240926.92457.tar"; - sha256 = "09hgnzzfi6wdy3p0nfl6a00npxpsdy30dyc89m1h087wlhkjjyci"; + url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-95.0.0.20250102.95738.tar"; + sha256 = "0pzqzz1a0shf0dm70c1d730m3dndal2dvm4dw65vxasj8vc1v8nx"; }; packageRequires = [ compat ]; meta = { @@ -4245,10 +4287,10 @@ elpaBuild { pname = "scala-mode"; ename = "scala-mode"; - version = "1.1.0.0.20240729.42046"; + version = "1.1.1.0.20241231.83915"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scala-mode-1.1.0.0.20240729.42046.tar"; - sha256 = "0981n96zx633iypwyz2f6af7r1lzx0lick7zv0azqglrwgnly35r"; + url = "https://elpa.nongnu.org/nongnu-devel/scala-mode-1.1.1.0.20241231.83915.tar"; + sha256 = "079w6awnk36h33fz4gsqcnc3llsfmv1pmwzqyy8vv27x65i9fxjs"; }; packageRequires = [ ]; meta = { @@ -4351,10 +4393,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.31.0.20241201.210325"; + version = "2.31snapshot0.20250101.45918"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31.0.20241201.210325.tar"; - sha256 = "05skikmrfcwbahph8z50kf1zh5vps7459zw7l1bipgyvhfvpq9fn"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250101.45918.tar"; + sha256 = "153phs96ibjap5hp0ffs9c9isdhc05vgdqr4hlhjyk62b71n71k4"; }; packageRequires = [ macrostep ]; meta = { @@ -4386,6 +4428,7 @@ ) { }; smartparens = callPackage ( { + dash, elpaBuild, fetchurl, lib, @@ -4393,12 +4436,12 @@ elpaBuild { pname = "smartparens"; ename = "smartparens"; - version = "1.11.0.0.20240713.100215"; + version = "1.11.0.0.20241220.125445"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20240713.100215.tar"; - sha256 = "0479n363cz4izdxdl2420fcmngbfjp7a5xv9xlxyab62aph63f0w"; + url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20241220.125445.tar"; + sha256 = "0ww5m3cj78abbpfrshbszgs21mnd6pfcpwrbnqz81a4qk37q3nny"; }; - packageRequires = [ ]; + packageRequires = [ dash ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/smartparens.html"; license = lib.licenses.free; @@ -4540,10 +4583,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.21.0.20241117.83905"; + version = "1.2.23.0.20250101.141954"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.21.0.20241117.83905.tar"; - sha256 = "0v95g129yp9s3kknbw1fp4iqn0f0g65bhvw4433v3dbinw9l3k74"; + url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.23.0.20250101.141954.tar"; + sha256 = "1srh30xxx7s4y79rc6fkq3aggywvnkd1wrhbmidhqd3lkfw3f1ms"; }; packageRequires = [ ]; meta = { @@ -4804,10 +4847,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.6.0.20241031.72940"; + version = "0.6.0.20250103.142809"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20241031.72940.tar"; - sha256 = "1m8qhar75cglg8qjh3sbgwkzkhfp3640nm73nddxrshnajn978bf"; + url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20250103.142809.tar"; + sha256 = "19mrjhi7qxwxp1shqqvkpmj49kari9g74wym3v2k80586kj2j0cm"; }; packageRequires = [ transient ]; meta = { @@ -4931,10 +4974,10 @@ elpaBuild { pname = "undo-fu"; ename = "undo-fu"; - version = "0.5.0.20240707.141050"; + version = "0.5.0.20241206.21950"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-0.5.0.20240707.141050.tar"; - sha256 = "0glgy1manfv9rykkxhafc969mhazd119zgrkm5fg9shcyb7q629a"; + url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-0.5.0.20241206.21950.tar"; + sha256 = "0kslql79g5y0sszjm6xxyxjzrnskm70dgglwwl2g4a1rjwavcp3v"; }; packageRequires = [ ]; meta = { @@ -4952,10 +4995,10 @@ elpaBuild { pname = "undo-fu-session"; ename = "undo-fu-session"; - version = "0.7.0.20240713.142701"; + version = "0.7.0.20241212.4030"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20240713.142701.tar"; - sha256 = "1c70cvf9f1x96l8gxfl4qpljwsqsqjcn745srsf9w9mcz520fyaa"; + url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20241212.4030.tar"; + sha256 = "1nggzbk1xi0w5f5y2xkp2jk4imfbqfaldngavslz1rhskiqwdqqa"; }; packageRequires = [ ]; meta = { @@ -5062,10 +5105,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.20.0.20240804.82110"; + version = "17.3.21.0.20241227.53016"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.20.0.20240804.82110.tar"; - sha256 = "17r0jhcgxnc1k42yxaw1i7wwyb0sp311a1gz8bdjax0zn05ki4xc"; + url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.21.0.20241227.53016.tar"; + sha256 = "0syhyqryfh2rvf2688rqfs3j0p0fh794vw85qwdh3kxi57w8ra8h"; }; packageRequires = [ ]; meta = { @@ -5130,10 +5173,10 @@ elpaBuild { pname = "wgrep"; ename = "wgrep"; - version = "3.0.0.0.20231216.120954"; + version = "3.0.0.0.20241206.130617"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/wgrep-3.0.0.0.20231216.120954.tar"; - sha256 = "1qadyl29a70d9m5z32s0r18rjxg0jdmbpjr47zgvppl807mfni85"; + url = "https://elpa.nongnu.org/nongnu-devel/wgrep-3.0.0.0.20241206.130617.tar"; + sha256 = "1ihwqz865wcdb83aw6nmzhnkrf7rnxqkcncmz7rvzddsrg19hahr"; }; packageRequires = [ ]; meta = { @@ -5283,10 +5326,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.8.20241118173945.0.20241118.174137"; + version = "26.9.20241225173150.0.20241225.173444"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.8.20241118173945.0.20241118.174137.tar"; - sha256 = "196hv8hjzp87b8y9k65w2zag46bx2jhmah1w9mdjxwkfbq6bjcmq"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20241225173150.0.20241225.173444.tar"; + sha256 = "08c168kcb0ds9g8hfqwd4qnymmg7z32k3g51ap9rqw6048cyl5fw"; }; packageRequires = [ ]; meta = { @@ -5369,10 +5412,10 @@ elpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "1.0.0.20241014.94920"; + version = "1.0.0.20241207.222105"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20241014.94920.tar"; - sha256 = "065wcvb295dhyi6jvb80vagzb8idqycchqgy32pj0fr6vcxx7y88"; + url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20241207.222105.tar"; + sha256 = "1nd9cnnwqrxizfzqdx3a4l9wj5sdr6gg42fss9dngbd22spa3kkb"; }; packageRequires = [ yasnippet ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 34b460fecaa0..2fa381aa484e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -220,10 +220,10 @@ elpaBuild { pname = "auto-dim-other-buffers"; ename = "auto-dim-other-buffers"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; - sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8"; + url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.2.1.tar"; + sha256 = "00x0niv1zd47b2xl19k3fi0xxskdndiabns107cxzwb7pnkp4f0m"; }; packageRequires = [ ]; meta = { @@ -284,10 +284,10 @@ elpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "3.1.1"; + version = "3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; - sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62"; + url = "https://elpa.nongnu.org/nongnu/bash-completion-3.2.tar"; + sha256 = "19xpv87nb1gskfsfqj8hmhbzlhxk0m6dflizsnrq94bh7rbw3s12"; }; packageRequires = [ ]; meta = { @@ -1031,10 +1031,10 @@ elpaBuild { pname = "dslide"; ename = "dslide"; - version = "0.5.5"; + version = "0.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dslide-0.5.5.tar"; - sha256 = "1hnmnl6ildr2cyc8hx1maa3vnz621d41yhsx8naxq3mssz4rkajp"; + url = "https://elpa.nongnu.org/nongnu/dslide-0.6.2.tar"; + sha256 = "02lny7c7v6345nlprmpi39pyk7m9lpr85g8xkd70ivkpc122qdy2"; }; packageRequires = [ ]; meta = { @@ -1108,6 +1108,48 @@ }; } ) { }; + eglot-inactive-regions = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eglot-inactive-regions"; + ename = "eglot-inactive-regions"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions-0.6.3.tar"; + sha256 = "03958dgr48zqak06qjqdz6qgfxn5rs60425qcvb7wdv2jb4400hc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions.html"; + license = lib.licenses.free; + }; + } + ) { }; + eldoc-diffstat = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eldoc-diffstat"; + ename = "eldoc-diffstat"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eldoc-diffstat-1.0.tar"; + sha256 = "0cxmhi1whzh4z62vv1pyvl2v6wr0jbq560m6zib8zicvdfxqlpgk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/eldoc-diffstat.html"; + license = lib.licenses.free; + }; + } + ) { }; elixir-mode = callPackage ( { elpaBuild, @@ -1425,10 +1467,10 @@ elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "3.0.4"; + version = "4.0.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar"; - sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz"; + url = "https://elpa.nongnu.org/nongnu/evil-matchit-4.0.1.tar"; + sha256 = "08vnf56zmqicfjwf7ihlmg9iil3bivhwpafq8vwlvp5nkmirhivv"; }; packageRequires = [ ]; meta = { @@ -2107,10 +2149,10 @@ elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.4.8"; + version = "0.4.10"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.8.tar"; - sha256 = "1sf6213qj6i306rqbp1a5wj7haw5vkmc1684fdfqzyqa1gw2ni5v"; + url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.10.tar"; + sha256 = "16z0f93x8x4ldyld2aqpprmk6xqz4qnd5fbrclcvj8gcg6qj4iz8"; }; packageRequires = [ compat @@ -2281,10 +2323,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gptel-0.9.6.tar"; - sha256 = "0n7d8plabgmpyl224079cqrwlgqq7wwysba0wd0ry75h6z388rcb"; + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.7.tar"; + sha256 = "0sh8q80q620d6yr4437ddrjrzygd15iwkc9jvwh3pw9sncv2laqn"; }; packageRequires = [ compat @@ -2635,10 +2677,10 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.4.2"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.4.2.tar"; - sha256 = "19cgx0x54xj2z98m8mr1xmz0bbja0nilh8n47mkbnzmcqidv75gq"; + url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.5.2.tar"; + sha256 = "1gn6kdxvds27bjfsamzihqg8bddwsyfmc2g36p50km2qfa8fgpvz"; }; packageRequires = [ compat @@ -2911,10 +2953,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.1.tar"; - sha256 = "0203h99yia5k37ansy2wshkiyn105jaahmkm0ncf54far8dw6mwx"; + url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.2.tar"; + sha256 = "1wwnyanxbpzy4n8n3ixafdbx7badkl1krcnk0yf5923f2ahiqhlr"; }; packageRequires = [ ]; meta = { @@ -3049,10 +3091,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.1.2.tar"; - sha256 = "1jyivrk78fnp7kcrac9sm2ldbxg9c96qhnlz06wv1m7hbvd3fgfx"; + url = "https://elpa.nongnu.org/nongnu/magit-4.2.0.tar"; + sha256 = "04nf4ff7a11z65mcw6qnkxwk9srpi248f1k0li947i4264gl3prd"; }; packageRequires = [ compat @@ -3080,10 +3122,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.2.tar"; - sha256 = "0g24aj030fh55y44f3c33708fbm02jwzggh75zvg63bka3g6j242"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.2.0.tar"; + sha256 = "05wlc327x45vfsphwz9bf1hl8w46ychqkp6j7wsngjzwzsifxmb4"; }; packageRequires = [ compat @@ -3129,10 +3171,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.7.tar"; - sha256 = "0qnkbab6y0gpqq0kvil4gnbajflpv0mz3pzcimcvz79dnmb0vc9p"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.8.tar"; + sha256 = "06jy1n7ikz4xdpw4rkma596pqgkxcmh7qfkz93584rjfqav88anl"; }; packageRequires = [ persist @@ -4031,10 +4073,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20241129.85359"; + version = "1.0.20250103.151851"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241129.85359.tar"; - sha256 = "0ish7ysdqypw849k9d3cw0bl69r5ksc3hrqdmyh8k2ipq2xbcn2w"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250103.151851.tar"; + sha256 = "11m25729hm7m5srjiys1ws070yi2aa7ni5rn240w9290nj1brjnb"; }; packageRequires = [ ]; meta = { @@ -4243,10 +4285,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "94.0"; + version = "95.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar"; - sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3"; + url = "https://elpa.nongnu.org/nongnu/scad-mode-95.0.tar"; + sha256 = "1wkpgrkx3cjmh72qg9yiq2x9sqswx6x6pbr8zzhldyjs6kmjl7km"; }; packageRequires = [ compat ]; meta = { @@ -4264,10 +4306,10 @@ elpaBuild { pname = "scala-mode"; ename = "scala-mode"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scala-mode-1.1.0.tar"; - sha256 = "1x3vw4fzy1z6gavnbsm4lnwzkp47zd8gasvxxvfk57qn09hpwixh"; + url = "https://elpa.nongnu.org/nongnu/scala-mode-1.1.1.tar"; + sha256 = "1dmaq00432smrwqx6ybw855vdwp7s8h358c135ji5d581mkhpai5"; }; packageRequires = [ ]; meta = { @@ -4559,10 +4601,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.21"; + version = "1.2.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.21.tar"; - sha256 = "1d0w96amchcpblcbkl16yiwsvj8qfpax66ysjg02550lhpb493x7"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.23.tar"; + sha256 = "0bvsv688mqhga8dffy3841wxs5pkw0vish15dgligll47cj98mzp"; }; packageRequires = [ ]; meta = { @@ -5056,10 +5098,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.20"; + version = "17.3.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.20.tar"; - sha256 = "1l4bmvc53ma2n3y143k86ip0w4am65zwxnl36lzqavs1hr55qvb2"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.21.tar"; + sha256 = "0yqaszrkllfgp0ph7rvjhz35wqzi4bas0qw70d49vaxq4z7bikzg"; }; packageRequires = [ ]; meta = { @@ -5277,10 +5319,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.8.20241118173945"; + version = "26.9.20241225173150"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.8.20241118173945.tar"; - sha256 = "1l6wwv1zmpsf64v23zzi2idjb14wnbpv5fcspiygiah62zag44vf"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20241225173150.tar"; + sha256 = "0b2pjrfa130n4bam80p676k3xz417d6dfn8921xh6msf8b14cwpv"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 241182b919d2..05d82f1ebf3a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -318,8 +318,8 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20240723, - 1401 + 20241217, + 839 ], "deps": [ "erlang", @@ -327,8 +327,8 @@ "maude-mode", "yasnippet" ], - "commit": "c3ba6466507bd35ae1d5a2d12e1da9d5c44a02b3", - "sha256": "1xssk5srbs56jibkpl8wb8qn021kwdg36kafi7immnrpic4fx1xk" + "commit": "debb48caef334870b4439609a9e818c7fd01f420", + "sha256": "0kicw2462pzhhrds2lws8s00d4xwmr7yaaskpj9r5rdr41qyxkxl" }, "stable": { "version": [ @@ -1104,8 +1104,8 @@ }, { "ename": "ac-rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "0p5acs9673sv9nf032b2bsjwxn9n6mfvhrp0ndzjp0gj5g1sc791", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -1832,11 +1832,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20240925, - 1925 + 20241216, + 2039 ], - "commit": "856d84f4ee29ada5c60eb1c25685822c6701c3d1", - "sha256": "1qfswdvcbyd7nlxc96w4ghhx9xsfk894wq1lwafax6b9lrr6w8v7" + "commit": "d688bf8889e6ff893558984d3cdb7d4335908a3f", + "sha256": "1wksibdw7lamgzvrpn35lix2xknbj1w9xx16pa61kp51sjp7yapc" }, "stable": { "version": [ @@ -1927,14 +1927,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20240926, - 927 + 20250101, + 910 ], "deps": [ "consult" ], - "commit": "569c661aa2333502759aee2d4c7c87a046b09d33", - "sha256": "11h7j0j9hw04ph6w4s9hcrxnszaca4krzllm6z0ynxrzbs7075g7" + "commit": "a9ed2407f2edf1421b2ca55946dfba190f39b034", + "sha256": "1xy8n73vkk19wh8yxzkg8mvs5z5h0979i002n43gnz5vsd58apx6" }, "stable": { "version": [ @@ -2866,11 +2866,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20240101, - 927 + 20250101, + 1002 ], - "commit": "47072beb416aa9d7d702230b1aff87436c81bd22", - "sha256": "1w8df7f0k6flmhk632qg7w0cxj5jn5kshmh66nw8z1sv31fd57pj" + "commit": "24e3740f88c29efda5c4791720a55c4c548b1ed8", + "sha256": "15r3iz438r47bcl2jdx1n81rv061yz8wczhpq83qllfrr94clr90" }, "stable": { "version": [ @@ -3283,11 +3283,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20241122, - 614 + 20250101, + 945 ], - "commit": "32706314adf6d02a407f2b0b411741d9c4722c05", - "sha256": "0kzqrz2dyx67jwhfqjv6j4fjvwn45jy7kxqfxd16iii4kqh24fr8" + "commit": "75367008d43d5c120341b3511c4a098b7abd5cbc", + "sha256": "0w7bahnxx8d2g157shmg3a05yi6yy5kx25f1nhxbc31mkk01b9r8" } }, { @@ -3969,11 +3969,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20241119, - 1 + 20241215, + 1911 ], - "commit": "56c8c1b575106e72bcab2227fd73cf34f7f3df79", - "sha256": "1ll2j35z2bgxfz4nkiminlfsmqb7gjcjapsmj001qb5sfzcy52p9" + "commit": "1e8daa3e21e44a2fbc138db6fb38a915b4288479", + "sha256": "1spmmhasky247bn5x6am2n8zpqay4llvqqpl3ibi4crrwncvxipl" }, "stable": { "version": [ @@ -4427,20 +4427,20 @@ "repo": "Sorixelle/astro-ts-mode", "unstable": { "version": [ - 20240724, - 332 + 20241230, + 256 ], - "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5", - "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2" + "commit": "23b21a067709091681d1d9986e48aae2758b8614", + "sha256": "0a952mhgc46pklf3pffyddn8fvp1dfzc6kl9c4a62nrmg5s1ahh4" }, "stable": { "version": [ - 2, + 3, 0, - 1 + 0 ], - "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5", - "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2" + "commit": "23b21a067709091681d1d9986e48aae2758b8614", + "sha256": "0a952mhgc46pklf3pffyddn8fvp1dfzc6kl9c4a62nrmg5s1ahh4" } }, { @@ -5022,15 +5022,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20240101, - 846 + 20250101, + 849 ], "deps": [ "keytar", "s" ], - "commit": "6c3389a30a0d998857ff6861b4c05bce5a07be82", - "sha256": "0jj8fiqdh5cp2dsvirwq9ll50dmz8hx4m288n7rqmfhgv6hj0wnb" + "commit": "2dd34b937e99e367386679e9f42d6ea0411ffe12", + "sha256": "12kmh1pix5rzfzdd23a3j8s95l4fppg46nwvgihp639vllb0bkyn" }, "stable": { "version": [ @@ -5135,20 +5135,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240805, - 1931 + 20250101, + 1410 ], - "commit": "5cc4e97443727554357f6c57614f12ca87419627", - "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p" + "commit": "f25aaf8f1e3c38c481aabcf08b7b31280b78a9ae", + "sha256": "0cd42xigvw7fy2qy5kn0xlc97sp03w8ja6qjs2y22h29xva6fwsl" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "5cc4e97443727554357f6c57614f12ca87419627", - "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p" + "commit": "f25aaf8f1e3c38c481aabcf08b7b31280b78a9ae", + "sha256": "0cd42xigvw7fy2qy5kn0xlc97sp03w8ja6qjs2y22h29xva6fwsl" } }, { @@ -5159,15 +5159,14 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20240320, - 1734 + 20250101, + 843 ], "deps": [ - "cl-lib", "popup" ], - "commit": "0c2f5a7d28b70bfe30b87378d58d74798a62741d", - "sha256": "0i70m57isahd9f1pigrx1qdl56cakjnkzyb28449pz9i31gs9sg5" + "commit": "01bbfdf12b34ad04d0a44c98c1385df6ef0db449", + "sha256": "0vzq2wlyd0n4cs6krx0350992hpf4xn55wrwj6jsqjlxpphx3bjz" }, "stable": { "version": [ @@ -5497,11 +5496,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20220209, - 2101 + 20241219, + 1845 ], - "commit": "33b5f88b799a17947c266b04ad59462c5aeb4ed7", - "sha256": "17h9hh8n6ib1crap8jdgjhaszvlqb4gri1z821apyn66lqvix7x8" + "commit": "ef869515118acf41ec37c30f9fe1bcd4243a5f65", + "sha256": "1ghzcrrhl2ymz8c9xkydvcx1q4kqdfiy28zj4kz42w9pssa9jsd2" } }, { @@ -5665,11 +5664,11 @@ "repo": "emacs-vs/auto-rename-tag", "unstable": { "version": [ - 20240120, - 1011 + 20250101, + 906 ], - "commit": "288c708e5c88113a5c8c5c44361f1d3c3e334a2e", - "sha256": "0ncq3m2za8i31kfvsjhaijbk0fp1ql2kzgdsg8mzlkihgcwx1cvy" + "commit": "b38895ff4821df3a0461959146e9f912d2acde4e", + "sha256": "1zyjrbvn9wijwxbxds5rjzdbcnkz2pa06invm9pjiwh01zxniwzh" }, "stable": { "version": [ @@ -6738,11 +6737,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20240908, - 114 + 20241215, + 126 ], - "commit": "077726249216bef6d98d0542eb6289641a58e8d0", - "sha256": "0ydr1qmx6f4zpfhhpx180sqp1x4p2an3157m7z51nivs79hx0nsm" + "commit": "1d48474c3c07521276f4e7d73317a654997b4381", + "sha256": "07zzn261hvckmvsrwxajlkwdwrihr3wz06149hvsibplkfj0rpga" }, "stable": { "version": [ @@ -6784,20 +6783,19 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20241118, - 1847 + 20250101, + 1458 ], - "commit": "f3a85184ef9cc925bedcdbd62f66dd63a658f181", - "sha256": "0nk62c0qkw4f365sxv21xnv6hk32mkrzr0bv0m5sl9n1li98b9kk" + "commit": "a4c8fbc90221b01d5376ad068d3640350d9130a8", + "sha256": "1wxxi3ylmc1k4dbd7lbcr33496lnz7zwxf7l4zfhgci1nfywk3ii" }, "stable": { "version": [ 3, - 1, - 1 + 2 ], - "commit": "a021468eec8ff8cacb74a9ea595d3587186e29ea", - "sha256": "0cly0m6msn8xv9857nv4syw8fldqzvsa4kciq7av40y26a61hvrh" + "commit": "ed9c76252ac82d6352ba438f664b390fdd0b5d6c", + "sha256": "0664dihdfvrbxqxy00fw0skdg454njm673ip54qrgkh38vyv5432" } }, { @@ -7495,11 +7493,11 @@ "repo": "jcs-elpa/better-scroll", "unstable": { "version": [ - 20240101, - 927 + 20250101, + 1002 ], - "commit": "faded1bd681f3c48337e7165adcabde194c73b2b", - "sha256": "0074ffh07ywk6c50kj5w82cply3iclpqihs5fb0xnxavxxh79mhg" + "commit": "14c700f8b43771a47f16b3385adbbddb741a03eb", + "sha256": "198bg0x8vq55lw6wx7ayql6ypfvxy8ms1nn9vrbsbh3c57pja10y" }, "stable": { "version": [ @@ -7606,14 +7604,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20230202, - 1721 + 20250102, + 1345 ], "deps": [ "biblio-core" ], - "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", - "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" + "commit": "b700f0f2929829b2ca971511c5ebe61c67027e9f", + "sha256": "1wmibsdyfpxi80fyacs6qllcffwdgg1vf7i22a3nr60vciac56f9" }, "stable": { "version": [ @@ -7999,26 +7997,26 @@ "repo": "divyaranjan/binder", "unstable": { "version": [ - 20241023, - 1154 + 20250101, + 1950 ], "deps": [ "seq" ], - "commit": "928a68ff2cb186404f4247499a9d8a7a7a8c1f84", - "sha256": "0c1zfvfj0zgv6v6xvchyn63lsfni4vrg40ladf193ds9vz44mxjh" + "commit": "08a0c9d4179ed31dcbacea3ab0077cd22db341b5", + "sha256": "1fdgl31zc15cysv1yys95j0106i2fwfxb3qcwwh7f3mcz2snr2md" }, "stable": { "version": [ 0, - 4, - 4 + 5, + 0 ], "deps": [ "seq" ], - "commit": "f02d6951b778adfa210dd94f177d2608277c94f4", - "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z" + "commit": "08a0c9d4179ed31dcbacea3ab0077cd22db341b5", + "sha256": "1fdgl31zc15cysv1yys95j0106i2fwfxb3qcwwh7f3mcz2snr2md" } }, { @@ -8204,8 +8202,8 @@ }, { "ename": "bitlbee", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "129asyzbxzbv120g06bhgrv2pbf5l7fcw5l3jq3zy5niw4z8pvb1", "fetcher": "github", "repo": "pjones/bitlbee-el", "unstable": { @@ -8249,14 +8247,19 @@ "repo": "grettke/blackboard-bold-mode", "unstable": { "version": [ - 20160813, - 206 + 20241216, + 2353 ], - "deps": [ - "cl-lib" + "commit": "f4959eb0adca6b3096e5fea1f7e549533e4d8d79", + "sha256": "00s0sckk9wgwp1y1vgwird64mlblzyjqvai8nvzfanqvhr5f9ygb" + }, + "stable": { + "version": [ + 2, + 0 ], - "commit": "5299cb064ba71baa3e331b8560bf8dd38cbbc4ed", - "sha256": "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj" + "commit": "f4959eb0adca6b3096e5fea1f7e549533e4d8d79", + "sha256": "00s0sckk9wgwp1y1vgwird64mlblzyjqvai8nvzfanqvhr5f9ygb" } }, { @@ -8869,29 +8872,6 @@ "sha256": "0346ljcb6b31y4wh5gikb7lpjpn4sqisk7frbdxqcp5yy15i1pmf" } }, - { - "ename": "bookmark-view", - "commit": "6dfa514cb33a27d778eb4f8cb5c3118050fc41ae", - "sha256": "1i9dc9s45l7idsw6zwk2m31p583sfilrwdvpmnhh68yi7k50mv6l", - "fetcher": "github", - "repo": "minad/bookmark-view", - "unstable": { - "version": [ - 20240102, - 334 - ], - "commit": "2d16b2f88a106e57c58ad2af1f7166a847996512", - "sha256": "0sh15mbs5j6nq4d2dh4xg1hh783r6sx4vf30jk07jw1392anxwp8" - }, - "stable": { - "version": [ - 0, - 2 - ], - "commit": "06e41de8ed7050e70627203c93b6132fec7e88d8", - "sha256": "07nvbp3b8bf2n5gaiz0fvr2himg624i80im4pzjx81k5fpb16sl7" - } - }, { "ename": "bool-flip", "commit": "f56377a7c3f4b75206ad9ba570c35dbf752079e9", @@ -8924,16 +8904,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20240628, - 703 + 20250101, + 2055 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "19a7f76e75759f5266986b40c470edb1f70c43df", - "sha256": "1cv6hf3lfhbxaqv0r4d56gfw956mq5ylv2c85hcfhv5jmj4k69w8" + "commit": "237b963231eeb820b5024191ebdf2a4353851bbb", + "sha256": "1c38yh3ar3wxsk77qwaf8db8ckjmvdb5wf559dpq1201hfda93l6" }, "stable": { "version": [ @@ -9208,25 +9188,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20240702, - 1846 + 20241226, + 2107 ], "deps": [ "fringe-helper" ], - "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2", - "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96" + "commit": "78ce2179d0bce9a63fe2a7f3f8a7687d427f5bae", + "sha256": "088cpq5kppw1kba8hhbqqmj45bgcmcj3y9h47vzs1cgiclhgkgfl" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "fringe-helper" ], - "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2", - "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96" + "commit": "78ce2179d0bce9a63fe2a7f3f8a7687d427f5bae", + "sha256": "088cpq5kppw1kba8hhbqqmj45bgcmcj3y9h47vzs1cgiclhgkgfl" } }, { @@ -9394,11 +9374,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20231120, - 721 + 20250104, + 1112 ], - "commit": "c387f3f0aaae147270c61dcd3140fb4eb20965ad", - "sha256": "1jbnm4wfz41ns51wl63qm2bkib7hfs437lx1bgdk9djbpiwik4d2" + "commit": "29f1c70451075e87a9f1747478cc78ed6d37de26", + "sha256": "0qs8qglz0kfrajqr68x4i16q14jd9ja3z8wsinlgwjivs5pxh1gi" } }, { @@ -9667,8 +9647,8 @@ }, { "ename": "buffer-sets", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "1zvvf62d4sry8xz5ng48472y79xc34xagm3bkwhv06r7asvzm84a", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "033impnaivscc5mb4mnq8nba1wxg46dn5y4z37lv9v26czgsyird", "fetcher": "sourcehut", "repo": "swflint/buffer-sets", "unstable": { @@ -9695,6 +9675,30 @@ "sha256": "0lz7bjmxzxkri6mvqk6lrl6dp58as6py3i41hkfkj9zjmjvsl589" } }, + { + "ename": "buffer-terminator", + "commit": "e5782914654d0a7593980aefef446c8694cf9a4e", + "sha256": "0gwpjgxpvk58g968hdqjq1ypm4mzsyq67fz2ikwiwn07zdghaif2", + "fetcher": "github", + "repo": "jamescherti/buffer-terminator.el", + "unstable": { + "version": [ + 20241217, + 519 + ], + "commit": "9afade5c176e6fceee37fa034b550f5dc6cdb8cc", + "sha256": "0mgvc94y97bw8swsc4gszk9la3bxzqkpizvkpgwjmfvkvk7lf0l3" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "8ea821806e58d9e5b7818c3ad2f5bcb51aa1a7ab", + "sha256": "1p15vad5yndf89x519a49pliqal5vws8dq8cjr7yvyca0sqkb2y2" + } + }, { "ename": "buffer-utils", "commit": "a082c2dc0458e3007a947923f5b97e88217199e8", @@ -9757,11 +9761,11 @@ "repo": "jcs-elpa/buffer-wrap", "unstable": { "version": [ - 20240101, - 935 + 20250101, + 1003 ], - "commit": "c2d12ef25ffac4827dc598d81fac75cb865663b6", - "sha256": "037crgbfyfzvd090nairqh1bnpyb3l5m9qy7bcsf7zsifwlj1wz6" + "commit": "60f205258981d3433700b9c1c8d14026a001bd5e", + "sha256": "1v7jzhqgp884avhi7wk5vnyr8f37ivqpl9dh7hvxqqw3qrybnvdi" }, "stable": { "version": [ @@ -10739,22 +10743,22 @@ }, { "ename": "call-graph", - "commit": "1206dea4f7040221775b315fd1e858448ca3dde6", - "sha256": "05gzsps5sr8id03imrhvwvns1c97r5kxfjdy3bns6a772n6danxn", + "commit": "64d78e41ddf64ea19aaae79075dc86c097856a42", + "sha256": "0v13ggqpmrr147qv0sgwhvnqg9vsf22y6xipcr2hynf32qsizk58", "fetcher": "github", - "repo": "emacsattic/call-graph", + "repo": "beacoder/call-graph", "unstable": { "version": [ - 20241111, - 117 + 20241209, + 435 ], "deps": [ "beacon", "ivy", "tree-mode" ], - "commit": "c19effc6d230822e08d181fb5943582878a8903b", - "sha256": "12my47321jjajgdqniajxl7wv7r7nh0gnlk8s55qdvi742127zmh" + "commit": "e6f02568d1095d01f3bc7f788f39c3901c448e69", + "sha256": "0qyx2089rqpr55w06vjg3dkdf8qby9qhmkhwm57inxfp40apb4fc" }, "stable": { "version": [ @@ -10883,25 +10887,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20241123, - 925 + 20250103, + 1744 ], "deps": [ "compat" ], - "commit": "9a7c44fe8b7ace73fa8ebf6b5805474f0ca07d01", - "sha256": "0qa4911y61y4nshb4nqq7yf7fp8ms39wjm1da51k48lypmw013yb" + "commit": "d981e8f9460f6434e60812780ed81eda54940a97", + "sha256": "11ghzcszh2bla4amnmqz7y5isw3ici8fqln327mmdzn97mm45h2z" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "compat" ], - "commit": "9110956a5155d5e3c460160fa1b4dac59322c229", - "sha256": "0dr7x258n9px15cr90bd2877dc8hzy726g0h6vix284w675c2nvi" + "commit": "bd40091f8ce1202632bf660bb8bfe78096ea4c0d", + "sha256": "0ij4skr231bh3qs7s49h4ni8zkagg8k6b3jr611c0wax5gas1jzl" } }, { @@ -10921,11 +10925,11 @@ "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc", - "sha256": "1vxqcjs9fxlms3nxhi0905bwbja5dm9pa72kcw4iyyjka2ln8mrd" + "commit": "b34ec28cceaf15b1082b74b50f03f770873c3636", + "sha256": "0q1ki9l0rsbp446zkwzvzv3pvykpiqjzilllqrjr7j65naij86c3" } }, { @@ -11069,11 +11073,11 @@ "repo": "peterstuart/cargo-transient", "unstable": { "version": [ - 20230512, - 131 + 20241204, + 1217 ], - "commit": "34d63dfb99ee9a6068dadd6390763c9735c17a85", - "sha256": "0yx3gjwah4phkhwgda56p4ag217l8mf96q7zm1p3dixwnrxbnpbs" + "commit": "b75511f911189b6b6c47976dd970eeb80ccfb3ee", + "sha256": "1s1kjc7xg55lnwn5ngdp89hnh2qp42x10cyqlji268xiglx0xzs2" } }, { @@ -11260,26 +11264,26 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20241126, - 133 + 20241220, + 2331 ], "deps": [ "transient" ], - "commit": "a84775d63b5a85b0254f8b80d412f3421d001204", - "sha256": "19rzqzhy2z03lx65712p1p23c5ji1nv1gxk3hq5q5fhvlm7r8qlz" + "commit": "66771bf3b1b947a8586d38ba72e689c7f09c438b", + "sha256": "0m1kdr1qyr0cr3mwhihkr6p20rvmlb17y1xrgmfv361cihxqgfmx" }, "stable": { "version": [ 2, 2, - 2 + 7 ], "deps": [ "transient" ], - "commit": "a84775d63b5a85b0254f8b80d412f3421d001204", - "sha256": "19rzqzhy2z03lx65712p1p23c5ji1nv1gxk3hq5q5fhvlm7r8qlz" + "commit": "66771bf3b1b947a8586d38ba72e689c7f09c438b", + "sha256": "0m1kdr1qyr0cr3mwhihkr6p20rvmlb17y1xrgmfv361cihxqgfmx" } }, { @@ -11290,28 +11294,28 @@ "repo": "kickingvegas/casual-avy", "unstable": { "version": [ - 20241021, - 2353 + 20241217, + 1931 ], "deps": [ "avy", "casual" ], - "commit": "7e8f7703f4ab4886f27241664aa5e1510103f74e", - "sha256": "0ln5abq0fvlph5zz008m5jajshdqj62c9y734mb6hn9pgfvh5hay" + "commit": "6716c12e9b7ba8325dab05d55c1ea5cc2b9a44f1", + "sha256": "0p4ljzgcr51wpcfs4r0nnpv4rgaivzcq4lbcyr9sfvgqhr1yr271" }, "stable": { "version": [ 2, 0, - 0 + 1 ], "deps": [ "avy", "casual" ], - "commit": "7e8f7703f4ab4886f27241664aa5e1510103f74e", - "sha256": "0ln5abq0fvlph5zz008m5jajshdqj62c9y734mb6hn9pgfvh5hay" + "commit": "6716c12e9b7ba8325dab05d55c1ea5cc2b9a44f1", + "sha256": "0p4ljzgcr51wpcfs4r0nnpv4rgaivzcq4lbcyr9sfvgqhr1yr271" } }, { @@ -11412,11 +11416,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20241016, - 2258 + 20241211, + 322 ], - "commit": "4441d5114fdcc2eb05186a974b4bbad7224e43b5", - "sha256": "1y2ads0w5l3mm0mxxbi2ppb6csq8hw2fd9cmak3myv13qzw92x3w" + "commit": "893981bb3d7aff4c6e41427e92dc514164fdfb59", + "sha256": "0d9cykz6pw1i2iil1vyz9njqabfkli4fgrk97kl4wqggdvxahlc9" }, "stable": { "version": [ @@ -11495,11 +11499,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20231209, - 1109 + 20241221, + 1256 ], - "commit": "0c124beae160d5ff9be927bfb5e1a5fd8d50817a", - "sha256": "0cpmryg6haqlrfz6hwm10k7iw66hgwclm8lhdbikr97b6536bni5" + "commit": "4b30010f98b34c7e1b3a3c327f9be0851ef83641", + "sha256": "0553i3qf1xkxc6vmr8p6c0c3smilbmq6ky4sgp6bgp13z7q7alx4" } }, { @@ -11697,14 +11701,14 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20240921, - 642 + 20241215, + 1321 ], "deps": [ "powerline" ], - "commit": "3d78b1e608b7c203e4e788894d8fa52a0a13207c", - "sha256": "1r0jvy3c5svwq3xj06fin5xzh0gf23r1pfk8bqa6r0fgfrq0rj5g" + "commit": "35389777bc7c4972e302d3793e1a5250f501404d", + "sha256": "1y2l3h850msrgpnjbzndacfbkcrvqmqym8zr2mrx3wilpnb8ba4v" }, "stable": { "version": [ @@ -11845,29 +11849,6 @@ "sha256": "17yk9d14kca8j92pi85w5cvdzw1dvw7w5gh9n7a3z79rgg4i4497" } }, - { - "ename": "ceylon-mode", - "commit": "09cd1a2ccf33b209a470780a66d54e1b1d597a86", - "sha256": "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4", - "fetcher": "github", - "repo": "lucaswerkmeister/ceylon-mode", - "unstable": { - "version": [ - 20180606, - 1324 - ], - "commit": "948515672bc596dc118e8e3ede3ede5ec6a3c95a", - "sha256": "1a9f9h5kywfy8c2kmaxc9vf5zcykbhghpi3ra2l3z5hm0knq54ay" - }, - "stable": { - "version": [ - 0, - 2 - ], - "commit": "00f790b3ed5ec48e2461e20a4d466ba45c634e13", - "sha256": "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640" - } - }, { "ename": "cfengine-code-style", "commit": "6a0ae196cac93c467cba4221efa8785d44049cb8", @@ -11924,16 +11905,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20241013, - 805 + 20241208, + 904 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "442f374ee338c6f7ffacbf1bca4233218303b6c1", - "sha256": "1rjyivcsaxc4d7mfks8bc7c8dgibrzfjvbrjc8m04w0g26q2llma" + "commit": "0457130319e6d41a28812f293199516378302e0a", + "sha256": "1mlyiwlzy49dm6dmrzq9zm2wv88xfx1qsq8b2jwl4df9bd4cmjvn" }, "stable": { "version": [ @@ -12197,26 +12178,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20241201, - 2252 + 20250104, + 1646 ], "deps": [ "shell-maker" ], - "commit": "5fc6c7dba6ef16e57d14f90c1ae05a0b0d36ba36", - "sha256": "12raxg5lf3cicj5rib48kc4mh4jdzp8nxhfxjkf807amp6rrlw74" + "commit": "8e4e440f1cca3d5ad49d8f90d8ab83617e263247", + "sha256": "19acs847kx40drqsc0mn0zc529r8s0h9aaxikhhcc27vz75417f5" }, "stable": { "version": [ 2, - 2, - 7 + 11, + 4 ], "deps": [ "shell-maker" ], - "commit": "63c7c092d80daa02d85890178bb879ddcfd04bde", - "sha256": "022wgc2mdd7b4xs7xjabmy95dx30yjgfbnv773vxfaq7z1c4ymbi" + "commit": "054a5635113cce301717afba6e9aadfb3a2f094f", + "sha256": "10418cy189k8avqi61spybkig4ddilx1csz61995yz20pms8kp4z" } }, { @@ -12227,15 +12208,15 @@ "repo": "kimim/chatu", "unstable": { "version": [ - 20240518, - 615 + 20250102, + 1213 ], "deps": [ "org", "plantuml-mode" ], - "commit": "f813f0bc926346fbd8151d2ae7079119d4657abb", - "sha256": "1xg5mcxsjlkayls1zknqgx3niwwrbrvj5dpmx68sljjwz4j8b8y5" + "commit": "e1420dc4bb63294ece93bf805424c6b5fafa0295", + "sha256": "09b4mkag96096xr71v3zq3ib7j7db1hfkbbgzyfchgmd8dsvj18z" } }, { @@ -12882,8 +12863,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20241115, - 343 + 20250103, + 1026 ], "deps": [ "clojure-mode", @@ -12894,14 +12875,14 @@ "spinner", "transient" ], - "commit": "c228dec27df6b2c68262f17158208fe699e1ce02", - "sha256": "0gxrmi9ykhmhmldrrijl73cz38473y8wapr4i9an4yv34r5g9mng" + "commit": "be8b2e5c0da96c17f2ca0d8127f7f2e120ee2829", + "sha256": "0cmqqak4908d4p1d9lgibb2p3baznhzqps0sb9klmm115rji13d0" }, "stable": { "version": [ 1, 16, - 0 + 1 ], "deps": [ "clojure-mode", @@ -12912,8 +12893,8 @@ "spinner", "transient" ], - "commit": "76eac5aa634adba9a5b632cfe670467ebe319126", - "sha256": "1r90w7n10zyqspvm52bjbkalxzzp3jxwmbrfmifiyqzqrl0lyfrr" + "commit": "588c5790f0c09f5c09076885e11a73eaef70c262", + "sha256": "1k0zdi5zpv730gkym98amfp00xpk1hkry231v98iiw1khp345lsm" } }, { @@ -13228,16 +13209,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240908, - 2154 + 20241223, + 844 ], "deps": [ "citar", "dash", "denote" ], - "commit": "c0c467653976ab40ff330fcb4586fadb69e48a29", - "sha256": "03fqq24ql6pgkjhjfv41xgsxqyd4czns9r9fzcnn1m4gbzpprf4v" + "commit": "66fd7a87d715631625d470bc0f9104178f39cef6", + "sha256": "1kn8pl0wi1s8s1n8a98jcy6i3rv9czk8s08jlh1sxdyim2szj39j" }, "stable": { "version": [ @@ -13294,15 +13275,15 @@ "repo": "emacs-citar/citar-org-roam", "unstable": { "version": [ - 20241124, - 1352 + 20241203, + 2325 ], "deps": [ "citar", "org-roam" ], - "commit": "e2cd111456d59fbf0b79e6684ad46c3686169f53", - "sha256": "1772k4jg1pr1a43bn80i0f4qhayhvlzvrmfcdh3nv0bxs14ssmwr" + "commit": "ff38add0aa40ba2014a6ee28a293fc1b9180cefa", + "sha256": "1zc8hy06dndkgl70z4cw45wifsb4ascq0f566ph6kck4qki73wik" }, "stable": { "version": [ @@ -13572,15 +13553,15 @@ "repo": "mzacho/claudia", "unstable": { "version": [ - 20241104, - 2217 + 20241216, + 2112 ], "deps": [ "markdown-mode", "uuidgen" ], - "commit": "f041f619a0e93ac5b07a05862bcb38a811d56d24", - "sha256": "141z590hb2cmrg5q1lv6f5z54gbyxaxl1v91ailsa22jxxr4qnq8" + "commit": "6905b1c734d18578537ae97a63a65a896ba341f1", + "sha256": "08f1h1dfy3ks3y7shqvj198s150lcja98lm9170cdgjj910akvjc" } }, { @@ -14237,11 +14218,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20241125, - 1123 + 20241211, + 1522 ], - "commit": "63356ee3bd6903e7b17822022f5a6ded2512b979", - "sha256": "1g1wac0nwlp0kl6wq1aivv0fymrwxb81sd3zy6k20yjg4s5aagvg" + "commit": "76630045fb5b1660c91e2ab960f5636f4d567c47", + "sha256": "1zgi9vd753af3zipxhj5b4v3b8j8bhs0hbgz8ng8i9dqd92xh6pp" }, "stable": { "version": [ @@ -14323,14 +14304,15 @@ "repo": "mpenet/clojure-snippets", "unstable": { "version": [ - 20220914, - 950 + 20241226, + 1639 ], "deps": [ + "cl-lib", "yasnippet" ], - "commit": "66d23f0ffedf2cc2be0387c3504b5f89d7300cfa", - "sha256": "0s0jcbwz6bb8215v1rsy1kw1jx19zkavykki9yq9njqm3n6imjax" + "commit": "1e96ed7215e9da7c003a370eb1f91ed5475e6b0d", + "sha256": "1nz16jcndd2vnms4bpjysb2ny2cz8csy3vyb3xlvrbb8ikblwlyh" }, "stable": { "version": [ @@ -14606,20 +14588,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20241121, - 1615 + 20241219, + 1518 ], - "commit": "eb281d34548f4234e68ff31d1050aca7e8441d86", - "sha256": "1r0s0scrdakp6fiwp91zj7i5svq3wyszhp0cq2lg2wssgkiphgz4" + "commit": "41abd532b64f178017ed4ffdbdb5af42d9056a8d", + "sha256": "1manw6lvfq5ik7h6lxw9g62i38fhdxr3srgzgfmwvd4hssikmw31" }, "stable": { "version": [ 3, 31, - 1 + 3 ], - "commit": "eb281d34548f4234e68ff31d1050aca7e8441d86", - "sha256": "1r0s0scrdakp6fiwp91zj7i5svq3wyszhp0cq2lg2wssgkiphgz4" + "commit": "41abd532b64f178017ed4ffdbdb5af42d9056a8d", + "sha256": "1manw6lvfq5ik7h6lxw9g62i38fhdxr3srgzgfmwvd4hssikmw31" } }, { @@ -14807,8 +14789,8 @@ "repo": "ag91/code-compass", "unstable": { "version": [ - 20241125, - 2243 + 20241211, + 24 ], "deps": [ "async", @@ -14816,8 +14798,8 @@ "s", "simple-httpd" ], - "commit": "6510b97280892d8831ff35dedefe9a7aa7b6326a", - "sha256": "0bs5kn9jr7lfaw472aq2c80ii7i76a0pdbijmh2dvdf33k6hy88l" + "commit": "76c5732de8746ea61d4d0cf9dad00b3c35874807", + "sha256": "0lv37n19gd433zf5y9i0v4f4g8pzy5ls4xfnaz27kqhsp7abbd1p" } }, { @@ -15217,11 +15199,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20231116, - 2258 + 20241227, + 223 ], - "commit": "5f790421b6eff5d2915819fa23cfcdb19827fa91", - "sha256": "19r9ymfj7b0m8w2ggmk2syydi57yh2ljg4mrvxi1rljplz4kgqy6" + "commit": "99839fe205ff7dd299b15355e98e6b0aeb9cc646", + "sha256": "05kqi21hbiib54sjza5k0ban18w236hbgmil43mq7qaplg9m73d3" }, "stable": { "version": [ @@ -15367,14 +15349,14 @@ "repo": "jcs-elpa/com-css-sort", "unstable": { "version": [ - 20240101, - 940 + 20250101, + 1004 ], "deps": [ "s" ], - "commit": "ad957f427dd6fe4af2f0690487fb5ebb28791741", - "sha256": "113pzvw97qd88f1y5rd4zakf6mfcq21s47gr5il3d9balkkgn0q2" + "commit": "4c6f8bfd88c0bcee9ac121f013d1fcd88f462bae", + "sha256": "1vf6w0kjzingidqd7bcvfvd5xlgzj9gbvj510xm42bbnsy6a90fh" }, "stable": { "version": [ @@ -15544,11 +15526,11 @@ "repo": "remyferre/comment-dwim-2", "unstable": { "version": [ - 20230730, - 1619 + 20241219, + 1643 ], - "commit": "69415caa1a381063d3e794912dfe88f672854ab0", - "sha256": "05ypgsdrgqj8105bvd17jn7w633y3ysbr5sgz33m7kj1ca7sl9ga" + "commit": "6ab75d0a690f0080e9b97c730aac817d04144cd0", + "sha256": "0v90x1s839bwsprfg9c246x8i52rybjpi59pcyj1aj198wwf8a35" }, "stable": { "version": [ @@ -15734,11 +15716,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20241106, - 2000 + 20250105, + 445 ], - "commit": "0ae7c293112248a0c36377d6859a95d216ae5e96", - "sha256": "0rg1i31qg4212i9d0020p37snzcaq22fb9lmv4p4x0xysk3wgp8v" + "commit": "6b4f28562c0f68e1a93d11ed4e9c08d828de22aa", + "sha256": "0gy9glm6b9cqyw2924g9dcfpba70z808azav9n95mi361m0088mp" }, "stable": { "version": [ @@ -16215,16 +16197,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20240101, - 926 + 20250101, + 1006 ], "deps": [ "company", "emojify", "ht" ], - "commit": "f115e03b9d4369f9170f4328028dd9c8080edb3d", - "sha256": "0ir20aqs96pmrrd8pa7g7l0vljxgadc5prni87cyryx0x9sj6bhw" + "commit": "7eff81607354feb9992ab6ff0f2c44c5a0dab229", + "sha256": "1ifqbrf5p3rs7wjlfcwra8g42gcih68sr39rbhmzrnxbn6hrhz27" }, "stable": { "version": [ @@ -16243,8 +16225,8 @@ }, { "ename": "company-erlang", - "commit": "ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219", - "sha256": "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "0cvrkzfc6kjkk679dx5k5g70ns6qyw17cfwlpk4qqcznlffnnnga", "fetcher": "github", "repo": "s-kostyaev/company-erlang", "unstable": { @@ -16319,16 +16301,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20240616, - 549 + 20250101, + 1006 ], "deps": [ "company", "ht", "s" ], - "commit": "204f7d63a5388637a3767c0232173c477ce96df3", - "sha256": "1kxij0npbhfr9ngn0dyhlp77ida76nvlxs0a45ycmmj44y5a37ah" + "commit": "6b7f4bc22dff085961dc51799d0674e58eb1af0d", + "sha256": "06y5si2chn4h51i1wy44kq4kmbzl680gi8jx4fnmfm0pmbf9c86k" }, "stable": { "version": [ @@ -17186,8 +17168,8 @@ }, { "ename": "company-rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "0vs58xarl6w8zjgqw7z2d1qi4jzw9cn26cmgxicc4pzpmjavarlx", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -17664,11 +17646,11 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20241130, - 442 + 20241226, + 250 ], - "commit": "67a12504ebf2cc43a6846a3e05b6e5c2e179db2f", - "sha256": "1kyrcpd5q938byc83f5a100jb4igzxgpj82f7ql39alzhibzskcn" + "commit": "ad9ca5af17dd18e73017b9bcedb3cabce5618e21", + "sha256": "07fgm3mkw1s4h02jcl2ms0wf5x1fi4v1lh6wv3imsnw8bghhyqnw" }, "stable": { "version": [ @@ -17688,19 +17670,19 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240923, - 1814 + 20250101, + 2156 ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" } }, { @@ -17711,25 +17693,25 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240923, - 1814 + 20250101, + 2156 ], "deps": [ "all-the-icons-completion" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "all-the-icons-completion" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" } }, { @@ -17740,56 +17722,56 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240923, - 1814 + 20250101, + 2156 ], "deps": [ "compile-multi", "embark" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "compile-multi", "embark" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" } }, { "ename": "compile-multi-nerd-icons", - "commit": "039b04da36001449531df13611e5663f8e61d313", - "sha256": "1bz76skwjmk927a3x6mnklwby4sxc0mq6s7dbixipjf1fyrnlkx3", + "commit": "477aae565d0bdec434b7cdc4499ce9890b29eb2c", + "sha256": "10krzgrq6rkf1643bjj00zwln9mx9ngbawkklwc127gk9k6x9hhd", "fetcher": "github", "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240921, - 1212 + 20250101, + 2156 ], "deps": [ "nerd-icons-completion" ], - "commit": "d6115349becc71cce3a335bf9b34265fe073e0bf", - "sha256": "06kvp3cmv70gbf4mkwavip9w9z9wx4jwar7sky9dnw1w7agffspb" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "nerd-icons-completion" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" } }, { @@ -17800,8 +17782,8 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20241129, - 809 + 20241222, + 1158 ], "deps": [ "eldoc", @@ -17809,14 +17791,14 @@ "plz", "seq" ], - "commit": "b8e7c34757c6b77aec948c143d8c89df08d4b7e8", - "sha256": "1lrjxkaf5979k0v0p20p9lk4azwbi629krqq66mybr1bmlw00vi6" + "commit": "862d3508e31f5d3ee0142414717d229e30bac477", + "sha256": "10qpqglv2vd1cnpd08nvhqhrdllnak5d6dqb0nnm1cq7fzkwyj16" }, "stable": { "version": [ 0, 6, - 0 + 1 ], "deps": [ "eldoc", @@ -17824,8 +17806,8 @@ "plz", "seq" ], - "commit": "b8e7c34757c6b77aec948c143d8c89df08d4b7e8", - "sha256": "1lrjxkaf5979k0v0p20p9lk4azwbi629krqq66mybr1bmlw00vi6" + "commit": "862d3508e31f5d3ee0142414717d229e30bac477", + "sha256": "10qpqglv2vd1cnpd08nvhqhrdllnak5d6dqb0nnm1cq7fzkwyj16" } }, { @@ -18148,25 +18130,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20241201, - 1337 + 20250105, + 39 ], "deps": [ "compat" ], - "commit": "eb26bdd008c4c92b1d79e49e2df71acc2a42faa3", - "sha256": "1xydhja0hrjv851vs66nwd8amm93qraccad78nxwhlimw2lw1fgn" + "commit": "036a13ccd4fdd8bafb20ad6d4baa2622520f1cb8", + "sha256": "1w9bbz9cgq7862vy904wdzkr0d3wa9fxymskpd9cv6aabm0bjy9k" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "compat" ], - "commit": "4889458dccf842ab6223099f8a73ff8b147e9459", - "sha256": "06jckxwagpvp4w8hykc0wr90pba9ih8376562g1q93g0nbb3rhrg" + "commit": "0d0ae4659ecaa3c12927fa3982c49610da573a88", + "sha256": "0gp5vj96gwlxzm9fqvr1hzqzdiilfypz5nvs46f50lqn2r4bsl96" } }, { @@ -18255,27 +18237,27 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240923, - 1814 + 20250101, + 2156 ], "deps": [ "compile-multi", "consult" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "compile-multi", "consult" ], - "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", - "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", + "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" } }, { @@ -18335,21 +18317,21 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20241107, - 2125 + 20250101, + 2155 ], "deps": [ "consult", "eglot", "project" ], - "commit": "c5f87d92448cd9c22a33ebd1feb54ca2fb89afa8", - "sha256": "0l7fg36zqcy0mzcs1fx515mppkf94r4fvss65vhambblrcd7z6nd" + "commit": "3ef13f931c6c6b3b2d086ff4c387ab7a05378370", + "sha256": "0y3n161kfa4a791jh70n6k1s6vyv55lr3ly8zz2zww5gxkx8m137" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ @@ -18357,27 +18339,40 @@ "eglot", "project" ], - "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d", - "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh" + "commit": "3ef13f931c6c6b3b2d086ff4c387ab7a05378370", + "sha256": "0y3n161kfa4a791jh70n6k1s6vyv55lr3ly8zz2zww5gxkx8m137" } }, { "ename": "consult-eglot-embark", - "commit": "258a113cb0f7902ca083c931c064c093b3721b52", - "sha256": "1k0iq93wx7azm8lxzvihgihlk5sxhax5syynl8irlw8cibfs1wip", + "commit": "36a607bac206486e3b6e054106d373a4ecebe8fa", + "sha256": "1hz5xl8813yg1wp1523cxliw2bs18rsvfp7xj11967nrznxvynls", "fetcher": "github", "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20241107, - 2125 + 20250101, + 2155 ], "deps": [ "consult-eglot", "embark-consult" ], - "commit": "c5f87d92448cd9c22a33ebd1feb54ca2fb89afa8", - "sha256": "0l7fg36zqcy0mzcs1fx515mppkf94r4fvss65vhambblrcd7z6nd" + "commit": "3ef13f931c6c6b3b2d086ff4c387ab7a05378370", + "sha256": "0y3n161kfa4a791jh70n6k1s6vyv55lr3ly8zz2zww5gxkx8m137" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "consult-eglot", + "embark-consult" + ], + "commit": "3ef13f931c6c6b3b2d086ff4c387ab7a05378370", + "sha256": "0y3n161kfa4a791jh70n6k1s6vyv55lr3ly8zz2zww5gxkx8m137" } }, { @@ -18388,15 +18383,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20241114, - 1120 + 20250101, + 914 ], "deps": [ "consult", "flycheck" ], - "commit": "fa7a3a3b5d31d318582f7a1935a3c812fcdc4368", - "sha256": "1adwmvx48dfp5qrcy02k2d1972ysrazpdl5c7m90b8allcg01y60" + "commit": "3bc2141daf8cfad7e4d2e2f78b15d45033f707a5", + "sha256": "0x0jbk0pyw2djwskn0f9nsqyyjh8j3g588vh500x4p1bnca4afvc" }, "stable": { "version": [ @@ -18437,26 +18432,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20241001, - 23 + 20241227, + 123 ], "deps": [ "consult", - "markdown-mode" + "markdown-mode", + "ox-gfm" ], - "commit": "bdc5516435ffa9efcd4de102b5d8549386b0ba6a", - "sha256": "1wc1fdg5f52nrpm7jd3sv3lldm02habr3ldqdgixfg2h867cgp0w" + "commit": "28f472574b05647ffdff1d265e28b91250404241", + "sha256": "10fpmc05mwzgcwk3yxc0bx4704inz9d2li0n1gxjb27g696ijjbp" }, "stable": { "version": [ - 1, + 2, 0 ], "deps": [ - "consult" + "consult", + "markdown-mode", + "ox-gfm" ], - "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", - "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", + "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" } }, { @@ -18467,27 +18465,27 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20240929, - 803 + 20241224, + 2130 ], "deps": [ "consult-gh", "embark-consult" ], - "commit": "4e4a1ef9a4823b37cf7057208f712aa69e1e0e2c", - "sha256": "0yx8mqx17iz2q28077z0w2pxnbxqr41mvj418wrqw2fgwm012v6n" + "commit": "7197855a46c6e37098257d05a168555a41ffaa51", + "sha256": "0a4s8ijxbk1x79fm0hyvsrkr3i45b7vxq2wb9j9pa2rjbq0zr44r" }, "stable": { "version": [ - 1, + 2, 0 ], "deps": [ - "consult", - "consult-gh" + "consult-gh", + "embark-consult" ], - "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", - "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", + "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" } }, { @@ -18498,20 +18496,20 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20240927, - 1004 + 20241219, + 507 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "79204bab021d9c58687dbce44694419c966d6998", - "sha256": "008gak4q21qw4bm1lsrxsz8dad5s6rh8v0fvlasjhhyfwwywdk09" + "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", + "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" }, "stable": { "version": [ - 1, + 2, 0 ], "deps": [ @@ -18519,8 +18517,8 @@ "consult-gh", "forge" ], - "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", - "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", + "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" } }, { @@ -18662,16 +18660,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240810, - 1318 + 20241213, + 1718 ], "deps": [ "consult", "dash", "s" ], - "commit": "6ece62337d6065e88a91b222fac5e252c00a8d53", - "sha256": "0jqfybd96wkqcdnwavsp2fzjxmqb7lff8ix23rvq7c1dsgrp0c0v" + "commit": "7c9cd970c75fae9a6140ca1beefed9532d8e1b96", + "sha256": "1lccpnqqaai6vsjn9v65xhpzs0bmhrsyflaxg3n3iszigmsxrfaz" } }, { @@ -18885,6 +18883,36 @@ "sha256": "0v336l9dary68i910yvpk9c24b9vrc1cx615hiv9dz8zi1khz8rr" } }, + { + "ename": "consult-vc-modified-files", + "commit": "d43c1de6dc0186c1d056bb6feb921a981fd6845c", + "sha256": "011jpw630cx05j0dgx9lk7m6r36sijdn2bhjglmhg0ajh7kg0j1q", + "fetcher": "github", + "repo": "chmouel/consult-vc-modified-files", + "unstable": { + "version": [ + 20241216, + 928 + ], + "deps": [ + "consult" + ], + "commit": "06387842bceb47887f6c07b148220a4e256d7eed", + "sha256": "1bxq6fny01a0a4gq5xzlrj6jg73pxdyp2fl89jzp5kh9h0kg3h0w" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "consult" + ], + "commit": "06387842bceb47887f6c07b148220a4e256d7eed", + "sha256": "1bxq6fny01a0a4gq5xzlrj6jg73pxdyp2fl89jzp5kh9h0kg3h0w" + } + }, { "ename": "consult-yasnippet", "commit": "da399d9149261f6fded5a465ba1b6f2353abfa5a", @@ -19062,6 +19090,28 @@ "sha256": "1vf4rr97y326lq76q57i2f7j3s264gqz36dnhaav0ivrzx8zwnyl" } }, + { + "ename": "copilot", + "commit": "66e9c25a9c1d4a0ed06f8b134b7eabf9c839704d", + "sha256": "11w10jfcsqr43akngmc2gb2w87zajn36k1nyvbkk9fkgiqr1h6av", + "fetcher": "github", + "repo": "copilot-emacs/copilot.el", + "unstable": { + "version": [ + 20241228, + 436 + ], + "deps": [ + "dash", + "editorconfig", + "f", + "jsonrpc", + "s" + ], + "commit": "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4", + "sha256": "1w07i3wyp3b49asjbw83h86sri9f7hj92fs3g0jv0sxv0pq38chp" + } + }, { "ename": "copilot-chat", "commit": "6e3852d02866ef577717fae04a56c876efa4217d", @@ -19070,8 +19120,8 @@ "repo": "chep/copilot-chat.el", "unstable": { "version": [ - 20241126, - 815 + 20250104, + 40 ], "deps": [ "chatgpt-shell", @@ -19079,8 +19129,8 @@ "markdown-mode", "request" ], - "commit": "b6d919022a81ae6f8e024a9cce2a8250a2451d09", - "sha256": "1s1g45h2mbs7xsl8wdra5zlgw5rvvamgvc9iicvhbsjhxhpr48vv" + "commit": "bad6e96ffbd6553dc3901151b203220e5d2bdd4c", + "sha256": "1qzbnnm13fr8n6bvps5q1xdq55kalw4fgdaqbi5mq802afbr0zi3" }, "stable": { "version": [ @@ -19247,25 +19297,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20241127, - 1554 + 20250103, + 2029 ], "deps": [ "compat" ], - "commit": "f10f58f446e2cbda738ae8738cf4a7464a8aeeab", - "sha256": "186y5x8hhq46l7a3m6k8cxg2wm2g4yynrm3fgasy9ys4xb7kjb7r" + "commit": "ec846c6aa373931508cc078b49a3a8ba8265c453", + "sha256": "0zgki3a3vc1lzx777ppf9b6pk71xkbjjjrh2x3by49zpq9za9p2h" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a", - "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0" + "commit": "b02f674c4523ee139365fe3c1e218af2a90d46d4", + "sha256": "11n8qdjpavvy0s1zhxzxxvcv5i07gsjs02ad7fj51p7j8y4hjvym" } }, { @@ -20318,11 +20368,11 @@ "repo": "WammKD/Emacs-CRC", "unstable": { "version": [ - 20241115, - 253 + 20241215, + 15 ], - "commit": "0c2d6bd56963c3a8b36e88d748a6cbaf3541c6a1", - "sha256": "02i6d0dyh1wfd5rcq91vk516n11mcp7w18m11z2nqdpr588b7zn2" + "commit": "527d3b336ccca95abb39b274a566b7c92a66a476", + "sha256": "0h85niqgl6jvjsh0qm7wgjly1qd5g6nbpnms8inwwfw761js6kkr" }, "stable": { "version": [ @@ -20330,8 +20380,8 @@ 1, 2 ], - "commit": "0c2d6bd56963c3a8b36e88d748a6cbaf3541c6a1", - "sha256": "02i6d0dyh1wfd5rcq91vk516n11mcp7w18m11z2nqdpr588b7zn2" + "commit": "527d3b336ccca95abb39b274a566b7c92a66a476", + "sha256": "0h85niqgl6jvjsh0qm7wgjly1qd5g6nbpnms8inwwfw761js6kkr" } }, { @@ -21177,6 +21227,29 @@ "sha256": "1lgbhzhmmcfz27s5mldh7421yk9wgbf4sk0126a912hlb5f3zvr0" } }, + { + "ename": "current-window-only", + "commit": "73f44e8c1ef83c73bc706cc05707bc243dd7bea9", + "sha256": "0mnb694i4sxi0yhw79pkc2h5wsmdgjxhflaya3p0v4y11cpx1a6p", + "fetcher": "github", + "repo": "FrostyX/current-window-only", + "unstable": { + "version": [ + 20241220, + 2006 + ], + "commit": "1e9c6fb55a4292c62818035f2bdc159512ac089f", + "sha256": "0z58lyw7fqdf2bqazi355fhxsbr0yxyv6nz7z7bprgzh8fgcgpiv" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "7883c1a0cb8ea3aad465bb31f768c3fdaac0a031", + "sha256": "10k0yfmydznrrs2789misqfl9y4f7bdikxfhg7190lqimbccpcgq" + } + }, { "ename": "current-word-highlight", "commit": "02d60c15b4624735ba7e62f7c27a27487f1c7caf", @@ -21502,11 +21575,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20241126, - 1056 + 20241225, + 1823 ], - "commit": "de2a20eb21ae9bddfa86468a7522b0ba29f0c387", - "sha256": "18d9ndgsx66f0w3a6gsvff6l7lqbmfqqjahm3zzjj50yk43yykig" + "commit": "e8754635a7dbb7b1712dc9fcf380acd3ed5a2db6", + "sha256": "15wp2iys0pyrwls0hx25gf1lr5f71jf9pak8ljd055c0klhd3yyv" }, "stable": { "version": [ @@ -21526,11 +21599,11 @@ "repo": "andorsk/d2-mode", "unstable": { "version": [ - 20241107, - 236 + 20241209, + 2156 ], - "commit": "872a0d79223d2fe0ecad02fd4474831ec623672f", - "sha256": "1hrxn43wavi1q3djbrqrsv732kzadkpnfm58prqrsv8k010ws886" + "commit": "e1fc7d6c1915acaf476060c0f79b8bdef6bd1952", + "sha256": "101y3mrc652sdfglnrrg8yhgz5y3xnl4wlk9jzplr97nk8af0s79" }, "stable": { "version": [ @@ -21588,8 +21661,21 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20241127, - 1211 + 20241223, + 1448 + ], + "deps": [ + "compat", + "s" + ], + "commit": "e1c0f5bb940b8149e0db414cc77c1ce504f5e3eb", + "sha256": "1s91r6zl5c4cbfp6ybz3r8i5kw200nqc92dsidf9wmbzz435m1ds" + }, + "stable": { + "version": [ + 2, + 1, + 0 ], "deps": [ "compat", @@ -21597,15 +21683,6 @@ ], "commit": "0dc7f1ec81fa70b3cafdc394413fe14fd3a413e4", "sha256": "1p5f2lf6jlsvyh6zhd6drc2njadlkn73djrykridsphzh92q88k0" - }, - "stable": { - "version": [ - 2, - 0, - 0 - ], - "commit": "dcf42cb3178d7245d6d49de346d5e2b44e5b7498", - "sha256": "00bkzfaw3bqykcks610vk9wlpa2z360xn32bpsrycacwfv29j7g4" } }, { @@ -21772,8 +21849,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20241101, - 659 + 20241216, + 1315 ], "deps": [ "bui", @@ -21786,8 +21863,8 @@ "posframe", "s" ], - "commit": "605448b4fd90ca25924bf029acf2bdd047045133", - "sha256": "1lpw7pgkq2nq5br8am8jz34lvgnkx61nkwf54b83w1rk2rrssam9" + "commit": "ffb795761273e1bdc3d0cd1ebdd43e36b7c08921", + "sha256": "1vzb3hhdlicy087faqlwm6r9kpmiypb9pacmyad7wk4i0q60ywdd" }, "stable": { "version": [ @@ -22147,11 +22224,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20241120, - 2030 + 20250101, + 845 ], - "commit": "9479466d39652a8e32b74ee83822421fa08024d9", - "sha256": "0xch9w4l1zs52pwlcyy6nrxnp31ysaxkbqpx4wx5nf2sglc8jixc" + "commit": "c9f8230f6b7992b7b40c3bb9abc36cc03b6a423d", + "sha256": "1jd8nhl84xzx2ij50q5pg094fdkdb27qwjn3x1kvwks68vw9vk2i" }, "stable": { "version": [ @@ -22190,14 +22267,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20240101, - 841 + 20250101, + 845 ], "deps": [ "dashboard" ], - "commit": "bc79640e8fcc625ff1af31d5e17b054b1f535f39", - "sha256": "07ygiy3i8vjvc6ga9dkxahvcznk1fzshy7m9w94jag5jm1vskrh1" + "commit": "4eea843e5b7dcc4fe23eaf67b163ed7b13b56613", + "sha256": "089w0sxxyarbsm7hcnw5yvrh6vyj3yc0ymvcnks9slw3ia3svxl9" }, "stable": { "version": [ @@ -22477,20 +22554,20 @@ "repo": "KeyWeeUsr/dbml-mode", "unstable": { "version": [ - 20241116, - 752 + 20241206, + 706 ], - "commit": "8baafca584012247859fe1a9e1d55eeed757a714", - "sha256": "0sf7qd5dsd11bawchf6mykxz2nmmisx2yjy933bphn3lqaczkg1a" + "commit": "fd2e4ec1356a63b05a15103631bd007bd089867c", + "sha256": "0ryjri1vf2pchznjgaxkplmnkvj4jixk7q6g6j930fg9s33jl07s" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "8baafca584012247859fe1a9e1d55eeed757a714", - "sha256": "0sf7qd5dsd11bawchf6mykxz2nmmisx2yjy933bphn3lqaczkg1a" + "commit": "fd2e4ec1356a63b05a15103631bd007bd089867c", + "sha256": "0ryjri1vf2pchznjgaxkplmnkvj4jixk7q6g6j930fg9s33jl07s" } }, { @@ -22516,15 +22593,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20230701, - 2340 + 20241227, + 2223 ], "deps": [ "ccc", "cdb" ], - "commit": "8c47f46e38a29a0f3eabcd524268d20573102467", - "sha256": "0k97n084wahsfmnv6xq2rifkclazbqp8482ap36iswvlqcmpkxn3" + "commit": "f81ed803e617ccd8175d4bf57a3062bc5ffe1945", + "sha256": "10kfgqgml8xg9jkghxzm0i4z2j6hjprkgqzgh1ac98m26lyczp9f" }, "stable": { "version": [ @@ -22578,16 +22655,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20241130, - 2235 + 20241210, + 1630 ], "deps": [ "dash", "s", "spinner" ], - "commit": "d89468d82abb778ef0938c5753be4498d5802a10", - "sha256": "0yaik954w89mg3vi6490p3c7aqjq885v5wg8gccdkaa2hl7acsdm" + "commit": "bb555790c6f404572d537e1e4adec8b4ff0515f5", + "sha256": "04jskm3qlxq7zvyvcn33gsjcd5312nzmrpznpkqai9gb1v2zhrd8" }, "stable": { "version": [ @@ -22611,11 +22688,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20241026, - 559 + 20250103, + 2349 ], - "commit": "89e0fdfb0c6a387c1fd693b34ee9608d758d0742", - "sha256": "1qzg2yky3mjygl8347pn8kms6k6y6br9bii1yq9qnwvwabbxxln4" + "commit": "3e7afbae0513a237220b64b08f378b1f78eb460b", + "sha256": "0q9i4gbvl4g3fcs6ncfk0xfdj4v4zy4xqgwjlx1x4k6kx0m4k5a7" }, "stable": { "version": [ @@ -22746,20 +22823,20 @@ "repo": "KeyWeeUsr/decor", "unstable": { "version": [ - 20240818, - 1100 + 20241210, + 646 ], - "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9", - "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy" + "commit": "fa91fd8dabc7e98d7c0fc5e01400aae90966b38d", + "sha256": "0nadpclb31fmbbmvfy8h2lbngz48fpfd6iqr6nvg153xdh7lq6fs" }, "stable": { "version": [ 1, 3, - 1 + 2 ], - "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9", - "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy" + "commit": "fa91fd8dabc7e98d7c0fc5e01400aae90966b38d", + "sha256": "0nadpclb31fmbbmvfy8h2lbngz48fpfd6iqr6nvg153xdh7lq6fs" } }, { @@ -22889,8 +22966,8 @@ "repo": "jcs-elpa/define-it", "unstable": { "version": [ - 20240101, - 933 + 20250101, + 1006 ], "deps": [ "define-word", @@ -22901,8 +22978,8 @@ "s", "wiki-summary" ], - "commit": "a12331b5f4098b3cb0b046398fc3a34de1651de6", - "sha256": "0qxlpzb0bxyqndgg6pcz4y8kn78vzspvx690n4lsp1m85xdzra92" + "commit": "28e5ad9ef4bba59b61a9f1f4f5efe545e892540b", + "sha256": "1p08p54h5idsm1jv4hy8716c1n72qd5mph7lkb7hwxkcgp4i0raj" }, "stable": { "version": [ @@ -23172,21 +23249,33 @@ }, { "ename": "denote-explore", - "commit": "f304db78b4bfeb4e1061b4ef221bf46e1bafe9d0", - "sha256": "0md432wh8yfsfhn87ncib04aziqj7mv3pfydj79d2k8dq95flyf5", + "commit": "47b58a99798e6366520d3a86f900fc6bd8744145", + "sha256": "18fzr8rlyhakjwbli387q1rz2mnx8c5r35rsg8pjl98d2frcprlf", "fetcher": "github", "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240825, - 2045 + 20250105, + 308 ], "deps": [ "dash", "denote" ], - "commit": "3d4b43f73210444942c95ee5db8e9976dfc9a1d9", - "sha256": "0d141146dapmrq3gby6ggnvdcp87zqj0amja3yjc2wr6s1z906fh" + "commit": "d2c1f94b6560d802755b010fcd4438068ddaa12f", + "sha256": "0773691jxyv039y407c8dppkky41b3icacavddcv9m8v481763b7" + }, + "stable": { + "version": [ + 3, + 3 + ], + "deps": [ + "dash", + "denote" + ], + "commit": "d2c1f94b6560d802755b010fcd4438068ddaa12f", + "sha256": "0773691jxyv039y407c8dppkky41b3icacavddcv9m8v481763b7" } }, { @@ -23561,6 +23650,35 @@ "sha256": "0g8kzaxjka7n9jdldh45m22nizgv0m0v94ns7vmmhf1hpsf3zfxz" } }, + { + "ename": "dicom", + "commit": "879fe6f4268ea058c6b1b6380dfbd1bc05917ffa", + "sha256": "0ixj9mg2q4s4457sxp0qd13q9cicgi3p904x8jc0a6clyz6nlh36", + "fetcher": "github", + "repo": "minad/dicom", + "unstable": { + "version": [ + 20250101, + 915 + ], + "deps": [ + "compat" + ], + "commit": "9100999aa85a12828d73dc9b43f49af4929fc86d", + "sha256": "0dkdckyp73pizcfxj8qvc55wanz3q41qg5x550sb1san6b4jnsm3" + }, + "stable": { + "version": [ + 0, + 5 + ], + "deps": [ + "compat" + ], + "commit": "54440a704c573cd91b663ac79a01264a1aa59c51", + "sha256": "02n5wagcznl5fhyfh222kklj4z90pfrqpzm7q97agyx8bynzwr2p" + } + }, { "ename": "dictcc", "commit": "cdc15fbd060183e2b06f0c776075beddf7433f39", @@ -23655,11 +23773,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20240818, - 2359 + 20241208, + 511 ], - "commit": "8edf92e34058f49788a085f490ad7ff169ef0d72", - "sha256": "17dm7b909j92hlfdz97k12mg7z71xvm9kncip36szflqrm14q33h" + "commit": "13f5938a087362776dd0e883734d48c610a0b379", + "sha256": "052gil83w9pylf63sqq2c3984gwy8jbr8a78ipyflwyas1l3yn80" } }, { @@ -23685,14 +23803,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20241128, - 2332 + 20241205, + 2338 ], "deps": [ "cl-lib" ], - "commit": "d9f54b512a0f583c6c3b51ce0c8ef62bffac7763", - "sha256": "1piy6ivq504zcgam9wabs5k2hinsmwj37wxlq0iy9qb0jhdakpdr" + "commit": "65a5de16e21c87b7c12a78a63fc3b57e07c03c86", + "sha256": "19ildcyyhakf7v1ycmk6srrsfxrj70mk6cs8m690wkxmh80fzgbj" }, "stable": { "version": [ @@ -23808,15 +23926,16 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20241030, - 1038 + 20250104, + 1325 ], "deps": [ "compat", - "magit" + "magit", + "transient" ], - "commit": "4980c08f7ad7777c364a3251bcc314b0f0d4d7dc", - "sha256": "1yrj9alg55rd4n9n3jsv3w2v8xv3b0bwi6xnw8fzs7zcdi4zn1n1" + "commit": "cfb5336ea97224d36883b2d6c05599094de94b77", + "sha256": "01av46zbwhfgr6xxim8r8x47llc63lwr66l8msfflvgxdw67zlz0" } }, { @@ -23844,26 +23963,26 @@ }, { "ename": "digistar-mode", - "commit": "851fa17152b664df99b80a654e5c055bb5227181", - "sha256": "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s", + "commit": "05a5f071cf34a94cb22a276f8d10ca46e5da535a", + "sha256": "1j2nq0yh0i08y490zmfbw7zpmqndgphqz9a9v1q5gqx9994jkqq9", "fetcher": "github", "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20240814, - 1546 + 20241229, + 2007 ], - "commit": "2d7e1a11304399f4a625053ffce8a3ad05f4ec7f", - "sha256": "1cybl34n18ib051lq5mnrg5f1b8j5rys2bly82x6a5ic640288dn" + "commit": "4c1ebcf22007ecc9e5b236864514b8b31c4b2576", + "sha256": "0kgc5mvf6k35q8j8ic0rzwydwgmn3xizv4nklv6m23jg8q66xjy3" }, "stable": { "version": [ 0, 9, - 14 + 15 ], - "commit": "4e5d0b463468fcc4a54df1310360ba13b2bdff6a", - "sha256": "10ng3dxckgzanxl4p4yn6syabhkzpiq49c9czdbfqhmabr5ayb3m" + "commit": "4c1ebcf22007ecc9e5b236864514b8b31c4b2576", + "sha256": "0kgc5mvf6k35q8j8ic0rzwydwgmn3xizv4nklv6m23jg8q66xjy3" } }, { @@ -24066,11 +24185,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20240926, - 16 + 20250101, + 1007 ], - "commit": "cc23f16e3735403eedde64078035240480a445f4", - "sha256": "0svp4hzyzxqqi30w088w62grdp92d19yhgj046bk3qn32ids63bb" + "commit": "6cc16c7b29b7f77b7df1fc59287551b1120a7bf7", + "sha256": "1j106rc9prcyj1l7yqlgvgryklma4zhg7gwx9zxm5k99c513bij1" }, "stable": { "version": [ @@ -24154,11 +24273,11 @@ "repo": "jamescherti/dir-config.el", "unstable": { "version": [ - 20240823, - 1339 + 20241203, + 322 ], - "commit": "39b835572f0d170da51560b583b2416f0b84d2d0", - "sha256": "02xfazs28qrqbx4b3v4hl4qrvy32bwy8v58idigxrlg7m5iqqrw3" + "commit": "37cca7dae727c9c15f9bfd0fa6be17dd903fe1ef", + "sha256": "1ffblq9d8ksp8pyxlpaqz70kg5j2yb8bgrvn08vcwn7bm4ska7g8" }, "stable": { "version": [ @@ -24420,30 +24539,6 @@ "sha256": "0lbm326na005k3pa11rqq5nbhvm55dydi2a7fzs3bzlqwbx7d6fq" } }, - { - "ename": "dired-fdclone", - "commit": "8a0ddc10b11772d72a473e8d24ab4641bf4239a4", - "sha256": "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9", - "fetcher": "github", - "repo": "knu/dired-fdclone.el", - "unstable": { - "version": [ - 20241201, - 1626 - ], - "commit": "e77bf1d5d2dcea903201e9c03fcdff9f0be72aa4", - "sha256": "1ch3kqidszva0cyhk3aj05jabcqcwj1xg93fx7zsd8qdir69s98f" - }, - "stable": { - "version": [ - 1, - 6, - 3 - ], - "commit": "e77bf1d5d2dcea903201e9c03fcdff9f0be72aa4", - "sha256": "1ch3kqidszva0cyhk3aj05jabcqcwj1xg93fx7zsd8qdir69s98f" - } - }, { "ename": "dired-filetype-face", "commit": "4e6c8015af3d5f013272308a97e089a4e3ca847d", @@ -24816,25 +24911,25 @@ "repo": "xuhdev/dired-quick-sort", "unstable": { "version": [ - 20240805, - 545 + 20250101, + 2131 ], "deps": [ "hydra" ], - "commit": "eaeab1021b391e3d6275ba7c186c5ac95fb8a10e", - "sha256": "1sxdiw1qwpr49a0l2q899r78mnwcwqhj4dfs22261acw7ifk07yb" + "commit": "68faa3abf52023edead271422a7ac76c0fd5c4e7", + "sha256": "1d4fxcf5dwq80p8jcxbvl4sd2g4kb8rlx9kvchwr8bg6wb237zir" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "hydra" ], - "commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a", - "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk" + "commit": "9c5c7f3a89a978888ce00d4fdc4a6520b5fd003f", + "sha256": "1d4fxcf5dwq80p8jcxbvl4sd2g4kb8rlx9kvchwr8bg6wb237zir" } }, { @@ -24998,14 +25093,15 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20240522, - 2316 + 20241205, + 259 ], "deps": [ + "compat", "dired-subtree" ], - "commit": "702165ad53a473992d84e0207b984b9be5114bde", - "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp" + "commit": "dd758094849a05c742868e8a9e57f47f7ec4d07a", + "sha256": "1kpg220q4hghdjcxmg87w09yr4z03f9knpf0zxs3wz4ggbllgh5g" }, "stable": { "version": [ @@ -25146,6 +25242,30 @@ "sha256": "01pxm6n7pcp11zbqrhv8hcr44wb1s08zw1gwpfqd3grdkmyqql8j" } }, + { + "ename": "diredfd", + "commit": "903b3658d8d36013463584ac4654e12d0f5cf1d0", + "sha256": "08jka1pszrbsmzfi6ppg52y41cvm16vhwwz7dwzfbjrg1jclyq49", + "fetcher": "github", + "repo": "knu/diredfd.el", + "unstable": { + "version": [ + 20241209, + 623 + ], + "commit": "d789710c7e9699dae6ca87dcbfc27641a85fa3b6", + "sha256": "0xlgzmx089whmmnka0ngz7mdxvdplci3b4xvxjdmsydxx99gj3q6" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "commit": "e234c0bf91649bd13de984f6ef1b2354565fd4ce", + "sha256": "0yb7918kxja9lsri4ak3pkksvs32picw3yg3b8x9j6vp4zd7gd3j" + } + }, { "ename": "diredfl", "commit": "3da86e18d423198766455929da1dcb3a9a3be381", @@ -25322,14 +25442,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20230519, - 1500 + 20250101, + 2121 ], "deps": [ "transient" ], - "commit": "119f9f59a618bb7b476c93e9ab1d7542c5c1df41", - "sha256": "00ap23b6q6qay2hz4nyvf9xsmib68hdf47gwyg9gjlq85qhagw41" + "commit": "2682932fb407f233712fe39cf5028163586be0f1", + "sha256": "0655prr87mc9llas2far3sqlq71b569a75gi1xf6x4iakh9dc1j2" }, "stable": { "version": [ @@ -25595,26 +25715,26 @@ "repo": "aurtzy/disproject", "unstable": { "version": [ - 20241128, - 2134 + 20241226, + 2043 ], "deps": [ "transient" ], - "commit": "15431e0d6947682ffba80f89e70918c86745eb57", - "sha256": "0d5bbkzzklr2v2b431mxf5xqm4vdbk220ihwyf90m12b5iq6gzp0" + "commit": "1062f228a62ec87fe4c40e46bae098117b412790", + "sha256": "15qj84l3dwh4zbg890jkk48fpiiy7mr1i0ixk7zcs6hjl1p8as70" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 1 ], "deps": [ "transient" ], - "commit": "15431e0d6947682ffba80f89e70918c86745eb57", - "sha256": "0d5bbkzzklr2v2b431mxf5xqm4vdbk220ihwyf90m12b5iq6gzp0" + "commit": "bbe8f5cb9a2b5ef7482d3a109c81d6622c55677a", + "sha256": "03wf14vilnysj9szcffsadhw86p68v3083dv98d99c8axm51n6hz" } }, { @@ -26043,11 +26163,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20240616, - 2345 + 20241208, + 505 ], - "commit": "cc363ed39f023642c4d8e7c91b26c802ca356fa3", - "sha256": "02kh8wk202qppac7l7ap8hknb1hbg06gi66w5cpxhp32lijh1m90" + "commit": "cc9d6b1d0dc0776331daa2d612c17473f1ddd337", + "sha256": "0hswfj09mrcjnl8f3px0glpjghl49z0g37i3s2kl428xaixdnfgf" } }, { @@ -26095,8 +26215,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20241111, - 859 + 20241223, + 1023 ], "deps": [ "aio", @@ -26105,8 +26225,8 @@ "tablist", "transient" ], - "commit": "ec2391a8e3404958cefee3dda23b2c89dcf807a2", - "sha256": "1wn3wks97vx74hgqc42q7fwblyarvjrbgcy2h1r7yf5cliwsl0v5" + "commit": "813c00410b40917cbfe7e8227ebd4fd60a027937", + "sha256": "0hki17wl3pwr0wnkdjw0kp2ga3sb0p29a66bm524zgnaplgladbl" }, "stable": { "version": [ @@ -26318,14 +26438,14 @@ "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20240101, - 901 + 20250101, + 908 ], "deps": [ "s" ], - "commit": "f780904cffd40e34d72bef04f73c7e007c5f98c0", - "sha256": "04wczm6xlgj0390sys3g6ja3lc01sgcknw2b9l0fmmlav1hzq6v9" + "commit": "76bfff172a1b915165854ed1ad3478d0366d528f", + "sha256": "1w1lbaj51q9j0b8x2xf29lbc5hjb6fmhy19m533f31likm2cjjk2" }, "stable": { "version": [ @@ -26496,16 +26616,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20241201, - 1338 + 20241225, + 206 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "d4985f0f6ebbc125995fdfd5a909ba6afe692d7d", - "sha256": "175c8qa0bfa15d85dn1sajpyajbv1kmsqcn8z9a6xc9g88y8midd" + "commit": "9d6f0f9635ae722b6bd943a76e996f54443e373f", + "sha256": "1704ikj93j9wvf4gc7dvmbsrhnvjiyd8r2j5i1m4m63f2536gvby" }, "stable": { "version": [ @@ -26829,11 +26949,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20241102, - 1301 + 20241217, + 2145 ], - "commit": "4e521e716c2c914d7003243238a00ed330cd17c9", - "sha256": "11jqkp1h2v05k7iasfhgx9j675md13iy8cf2bviyd3g2jz4p99fs" + "commit": "a3508f702f96ff262f213de4a49d173449e2cf32", + "sha256": "0qzsw6x5d1qpwfr29zkgd5wlafxk9b2x68pm4pyda99bmr9kd0dp" }, "stable": { "version": [ @@ -27041,20 +27161,20 @@ "repo": "positron-solutions/dslide", "unstable": { "version": [ - 20241128, - 1102 + 20250102, + 819 ], - "commit": "c0e4aff0ac8a51df4020bd591d19bd749c92f024", - "sha256": "1ah1319lnjzvja5yv0qjb6jz5b0i3xaa5m708c1xgr4mxk3blzvs" + "commit": "be47f2dcb939779067f8c77c3493162bcf242b83", + "sha256": "0kznpg734vq4k0gz3scm176ak7z0pm7hc19mbnf7n0bba6pnybr5" }, "stable": { "version": [ 0, - 5, - 5 + 6, + 2 ], - "commit": "0d9a1f6c27e0543e912213d0a5047999f9e5deb5", - "sha256": "02c4v3zv8q2dqln3lfn2055bnffafc7yczrn3jyvw0f9hcw77ibr" + "commit": "be47f2dcb939779067f8c77c3493162bcf242b83", + "sha256": "0kznpg734vq4k0gz3scm176ak7z0pm7hc19mbnf7n0bba6pnybr5" } }, { @@ -27305,11 +27425,11 @@ "stable": { "version": [ 3, - 16, - 0 + 17, + 1 ], - "commit": "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed", - "sha256": "0sxz15g1lhgm880glix2y0dinsidpv83ss7cvb2ff12rbjhk4a4w" + "commit": "12010a06d8ec7cdcf8a1f63b242e9626e1bd620f", + "sha256": "0z7vzkarwj5r6fg0fapniawjpyh8lzi4q3brg75f95n7dl8vcl7f" } }, { @@ -27602,11 +27722,20 @@ "repo": "Lindydancer/dynamic-spaces", "unstable": { "version": [ - 20171027, - 1851 + 20250102, + 736 ], - "commit": "97ae8480c257ba573ca3d06dbf602f9b23c41d38", - "sha256": "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj" + "commit": "dade49afa9eb2700a02de0333935a28b39b15b7b", + "sha256": "0gfsxpb8lg2ylcvnd67b4n4z1bh9cv6bpx4vhhm1rmxaljskww2j" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "dade49afa9eb2700a02de0333935a28b39b15b7b", + "sha256": "0gfsxpb8lg2ylcvnd67b4n4z1bh9cv6bpx4vhhm1rmxaljskww2j" } }, { @@ -27955,20 +28084,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20241123, - 1454 + 20250101, + 836 ], - "commit": "106755df719ceb202d52146d436f370f5bf8f095", - "sha256": "04k7q2jka4dr2sbxx54i18y2j78rfky8fmghxk5sb3pvmkz0j7c1" + "commit": "25f7f00ad4d73aacca027d6e1ba6070b8b2019b0", + "sha256": "1i6pck66l45x0p04kayjrsvi0516z730wb68cpshyfrbc409narx" }, "stable": { "version": [ 0, 10, - 1 + 2 ], - "commit": "34c20849530c59547e032900bba87f5ef05f192a", - "sha256": "1jy29mjkw0a6y8aawsmzcq246m4bg85iq35jcl7kdjccwywpj1b7" + "commit": "1f8ca182fbd857598200d5a324c3913d610e7339", + "sha256": "19vkfn9h8yhsb533w4njq8f8w59krjybpganr4xc5kargydvmh4p" } }, { @@ -27979,14 +28108,14 @@ "repo": "emacs-eask/eask-mode", "unstable": { "version": [ - 20240101, - 819 + 20250101, + 836 ], "deps": [ "eask" ], - "commit": "774bf05f2d778a107f27f8fa47034ad15f16395c", - "sha256": "00m1ha91clcjwnxyqszbdw7shgjy602x0f89jqmn1jqasf3wp1kb" + "commit": "9bab3ad0d9a7df6284daed9ecd2cbd89298b958f", + "sha256": "07651b7hblvhh4fw0ak9l9ny20cgsx2qxb3v09xyxnr1n9yl45i3" }, "stable": { "version": [ @@ -28006,8 +28135,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240608, - 744 + 20250101, + 836 ], "deps": [ "ansi", @@ -28016,8 +28145,8 @@ "lv", "marquee-header" ], - "commit": "d75ec4865742a4939bd685360f8ec5b076bdcf77", - "sha256": "10zqx7kfjw6rzq0mqpj4s3sdb13rabw98bkgm9nddi387ffmamql" + "commit": "fbb64633a690ee1afe8aef873b7be3471e766788", + "sha256": "17xdwfq42mvklikfmpf6q6bsa8rli977rgd56z1z1zjif6p5x5jl" }, "stable": { "version": [ @@ -28316,28 +28445,27 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20241125, - 1941 + 20241205, + 1040 ], "deps": [ "compat", "parsebib" ], - "commit": "dabc7d5b14e4371475ddc1061e9c52f0ef91e671", - "sha256": "0y9w0b09djji6v1ayrqins7awms121q2k1z9mxyc0kl9d8q72n4d" + "commit": "5c68941d6580e5eb9b30ab5ed59a2f02581ec810", + "sha256": "19hsrkqk5ydhpfr91j87yp9s7lskkkggj65mq9awxslxm5w44awr" }, "stable": { "version": [ 2, - 44, - 1 + 48 ], "deps": [ "compat", "parsebib" ], - "commit": "315a8b067059f7d2c4e19220586dfbb042161fc4", - "sha256": "1lba6556ilml3kq8fxd1nkmx3dank36n68v3msad0npkj8083xlb" + "commit": "0b5a6b71d723225f19720425fea8229dc77310c2", + "sha256": "11rm51lx5nz2drhjb4nm5ls57gz9rqf9wm51qp9r03rlvrr6v85c" } }, { @@ -28498,8 +28626,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20240315, - 2350 + 20241226, + 1759 ], "deps": [ "ansi", @@ -28509,8 +28637,8 @@ "f", "s" ], - "commit": "11225972934b3cfe09ada87dd785f8dd0082b6e3", - "sha256": "0m3p25kxqzj4mndb7bpi6ymb309zsq46102g38yq244dsd3xwqdy" + "commit": "70cb0748b222b7c96ab9821ef898ffbdb45eacd8", + "sha256": "1z1shz6f106kqiihv3ffd1cvkx0lxnylalgbhfmy5wbjdpjy60f1" }, "stable": { "version": [ @@ -29524,20 +29652,20 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20240122, - 1953 + 20250104, + 2056 ], - "commit": "d497539f00c33e3bee85d0f4b8ca367672fa2219", - "sha256": "0gsfmjm71xcwhrznalm49ic47d4x7l6rizmyqr8mb4x8sbdbjhgn" + "commit": "1ce9aeb3f535843d15cf90d3f5fb07ada3d347a4", + "sha256": "0wp4g4agnnrjbjdzwa7da5qmsa79pk8z1zrrz18aix2sbm32w34q" }, "stable": { "version": [ 2, 3, - 1 + 2 ], - "commit": "8cabc6d77b41bf0c9982ab56530c088d980bc353", - "sha256": "02hbvs6dqjcjiws3672frgbnr62l2biqjqs0npkhz6b50h99gzzr" + "commit": "7e163774a6a7e1e9f93e7045d3d239e35c424933", + "sha256": "0z0c2k0grap483zzkzhiaii3w9p4dgcpnzvmmywclflvylvzhqv5" } }, { @@ -29848,26 +29976,26 @@ "repo": "meedstrom/el-job", "unstable": { "version": [ - 20241201, - 1208 + 20241229, + 1444 ], "deps": [ "compat" ], - "commit": "1bb6865aae4368b6e9f7491bd7c3f3e6fb1d7e7c", - "sha256": "1762ck9zp5p9qykf6spl0fs89k7drznjrm3q59j2lgwf1i0dzb9m" + "commit": "5c28a27d993c295527e9fa6c0b5d833a9bdcc1f7", + "sha256": "0zwnp4larmfbkzlrjhk3qwr25350hf1k859iswzifmkpxcclj70w" }, "stable": { "version": [ 0, 3, - 15 + 19 ], "deps": [ "compat" ], - "commit": "1bb6865aae4368b6e9f7491bd7c3f3e6fb1d7e7c", - "sha256": "1762ck9zp5p9qykf6spl0fs89k7drznjrm3q59j2lgwf1i0dzb9m" + "commit": "5c28a27d993c295527e9fa6c0b5d833a9bdcc1f7", + "sha256": "0zwnp4larmfbkzlrjhk3qwr25350hf1k859iswzifmkpxcclj70w" } }, { @@ -30263,20 +30391,19 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20241129, - 2121 + 20241217, + 1230 ], - "commit": "7001727c9cbb8ee29de7b9761afd887db8cb0a94", - "sha256": "1ckhr6h57d5rqzw30079pc92yv6125vls17nwylxvawbj24imng9" + "commit": "42f80c129264ab666e3ff589ee3bbc8f6c51a637", + "sha256": "0p00m7v1vsf4rs1w19ahy27lvf0wbrc5lh1243fyh74xllmg0kyi" }, "stable": { "version": [ 1, - 10, - 3 + 11 ], - "commit": "b5f583c70742ba371ff5c176d515c71d5407cf79", - "sha256": "0ha2ppxqp36m26nv6lyspq6m6xvvr03cf82rygq45w729gakdw9r" + "commit": "d9b35faade3d361a2a263511c16b8c1fe7614f5b", + "sha256": "144wf5im2fy1fv8jjik1s9zfyicphh2pi4dp6q4airrkiirmmr3m" } }, { @@ -30326,14 +30453,14 @@ "repo": "emacs-eask/eldoc-eask", "unstable": { "version": [ - 20240101, - 819 + 20250101, + 837 ], "deps": [ "eask" ], - "commit": "ade0f239814f3b8bc77229e903d2c4b806ded90a", - "sha256": "1d1zzmsvgp2ww9a53j08v9pk10p2bjzf2937sd1szlhryssgvrmm" + "commit": "2433fa00abfa8d4b384aff022f496287e0975776", + "sha256": "1mbh62advmgpmd022qijmy5yid3zjg3h6zvzvz1rwx401j40jqdc" }, "stable": { "version": [ @@ -30944,38 +31071,6 @@ "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, - { - "ename": "elfeed-web", - "commit": "62459d16ee44d5fcf170c0ebc981ca2c7d4672f2", - "sha256": "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n", - "fetcher": "github", - "repo": "skeeto/elfeed", - "unstable": { - "version": [ - 20240729, - 1741 - ], - "deps": [ - "elfeed", - "simple-httpd" - ], - "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", - "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" - }, - "stable": { - "version": [ - 3, - 4, - 2 - ], - "deps": [ - "elfeed", - "simple-httpd" - ], - "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", - "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" - } - }, { "ename": "elfeed-webkit", "commit": "75394f3a128e21c730ca755fca540c4723436733", @@ -31062,8 +31157,8 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20241123, - 2205 + 20250102, + 1639 ], "deps": [ "async", @@ -31071,14 +31166,14 @@ "llm", "plz" ], - "commit": "322d7eb839f1e981b8aa09a6ee4a7d6a22173772", - "sha256": "0slmp0fzmkww8al6w3h2b0vimbsppxbjrz29braw4j3lskq1isd7" + "commit": "bac0e51c7cad21ab25a0824ea816386ea78858b2", + "sha256": "1d6qz2skpnbm66yf5i8yd3l543frb6jp36fn325d3jw35kw29799" }, "stable": { "version": [ 1, 1, - 3 + 4 ], "deps": [ "async", @@ -31086,8 +31181,8 @@ "llm", "plz" ], - "commit": "322d7eb839f1e981b8aa09a6ee4a7d6a22173772", - "sha256": "0slmp0fzmkww8al6w3h2b0vimbsppxbjrz29braw4j3lskq1isd7" + "commit": "bac0e51c7cad21ab25a0824ea816386ea78858b2", + "sha256": "1d6qz2skpnbm66yf5i8yd3l543frb6jp36fn325d3jw35kw29799" } }, { @@ -31364,14 +31459,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20240820, - 947 + 20241228, + 919 ], "deps": [ "heex-ts-mode" ], - "commit": "b35c983f551ccf821ebebad50747b5b417133e52", - "sha256": "0cdkcrjnljdc6nq7ljyrdcfz3x7h1chjrq2b8fbh8xk2fmq8wgqa" + "commit": "143b94f4a5ac1f161c232e3f25b84c6768be2f25", + "sha256": "18fa062bygiaprph5ysz2xy2nwi1xlzhf89kn48d31a7qq0rk592" } }, { @@ -31412,8 +31507,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20241129, - 2147 + 20250102, + 1513 ], "deps": [ "compat", @@ -31421,14 +31516,14 @@ "spinner", "transient" ], - "commit": "d4927093e2988084eac86c3254a7b7f5d4cbd761", - "sha256": "1abjp70q9ms6kdd1rs4zcrqzz0hfy7a5bizgl0ddrx7r0sfk9r06" + "commit": "d208ec10cebbea5412e6dd333f741a2be7919f87", + "sha256": "15p9mdkjda7q9s2wgl4k74bwh72agk5f35al8fpfyzpk3187gpm5" }, "stable": { "version": [ 0, 13, - 0 + 1 ], "deps": [ "compat", @@ -31436,8 +31531,8 @@ "spinner", "transient" ], - "commit": "d4927093e2988084eac86c3254a7b7f5d4cbd761", - "sha256": "1abjp70q9ms6kdd1rs4zcrqzz0hfy7a5bizgl0ddrx7r0sfk9r06" + "commit": "d208ec10cebbea5412e6dd333f741a2be7919f87", + "sha256": "15p9mdkjda7q9s2wgl4k74bwh72agk5f35al8fpfyzpk3187gpm5" } }, { @@ -31836,8 +31931,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20240109, - 1445 + 20241227, + 2255 ], "deps": [ "company", @@ -31846,8 +31941,8 @@ "s", "yasnippet" ], - "commit": "777e9909c8f1c11f1cfb8dbf5fe4a66d2ab95e1e", - "sha256": "0acnlp60f2c9fmjac51xjg9r8qr39al2v5j6yd2mb6hi95sxbz3c" + "commit": "bcfd5e8c25e5efbcb26cfcf389f1bf01c2e2f44f", + "sha256": "00vvwa7h371fnq687mvccnlv38mjwzlr6h6yrzg0s8bl8vjg85q3" }, "stable": { "version": [ @@ -32179,28 +32274,28 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20241123, - 2125 + 20250101, + 1415 ], "deps": [ "compat", "llama" ], - "commit": "02ceae51c97ee0b05433c58faf874f68a88fa255", - "sha256": "0m67xcb1aks29c9zymlwmvkaswzpb8vx9m6x3s6qg9y13kvnxmhh" + "commit": "bc6f3c20fff7f1e6fe424e6573b0932d8eb291b8", + "sha256": "1j3h45gmqb2zl72ia7h60xp89cjwb9jnirf9sbh8xgbhxhk4wihh" }, "stable": { "version": [ 2, 0, - 3 + 4 ], "deps": [ "compat", "llama" ], - "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda", - "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k" + "commit": "bc6f3c20fff7f1e6fe424e6573b0932d8eb291b8", + "sha256": "1j3h45gmqb2zl72ia7h60xp89cjwb9jnirf9sbh8xgbhxhk4wihh" } }, { @@ -32211,14 +32306,14 @@ "repo": "lanceberge/elysium", "unstable": { "version": [ - 20241102, - 2222 + 20241203, + 2249 ], "deps": [ "gptel" ], - "commit": "dcb194e0e49e2c1864e0fa2ccec3d7e37b0a44b6", - "sha256": "0cygwyg0x136h6im8n87lpw8vck2zava87bqhjv2pp6ibjw3nsqw" + "commit": "1847dc71bef86e1828be34539a9ae60c3debedc4", + "sha256": "1ci5zbhxmyfkvbz3ssqlaa4s9j9pi6z1k77jqax30cxf8q8j5dqm" }, "stable": { "version": [ @@ -32256,20 +32351,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20241119, - 1435 + 20241206, + 557 ], - "commit": "0868b7f52adae264fb79e10e57a7481632eee76e", - "sha256": "1hs8arpbw1q1y3mwz2kyanqp2qs6pfbzfk9icba0cavk481whhjv" + "commit": "810f5e8b97e3046bdc7b0195067335b8eecb0bcb", + "sha256": "0wc7f6sgwykkmm8awyim9iv5pzjn4vmgmh4kjph4d4hv6n651mdh" }, "stable": { "version": [ 1, - 5, - 20241119 + 6, + 20241206 ], - "commit": "0868b7f52adae264fb79e10e57a7481632eee76e", - "sha256": "1hs8arpbw1q1y3mwz2kyanqp2qs6pfbzfk9icba0cavk481whhjv" + "commit": "810f5e8b97e3046bdc7b0195067335b8eecb0bcb", + "sha256": "0wc7f6sgwykkmm8awyim9iv5pzjn4vmgmh4kjph4d4hv6n651mdh" } }, { @@ -32653,29 +32748,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20241129, - 1513 + 20241227, + 1254 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c8b56ade72452b3fe1d3eed7b6d2518d592db386", - "sha256": "0xwcyq1i4jf51rzp5nam9wk1mmd12n00459z443r5fc390vgzi0p" + "commit": "28127920e4e7dfb225bcff250e1efef30d347663", + "sha256": "05ynmzgspc66z3i6r95lk302zyx78yn7m6ap3s1dvqb14ykx6gn7" }, "stable": { "version": [ - 20, - 2 + 21 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b7e4a4cdbdb7e55300882d6c9a4f71048ec298d5", - "sha256": "1csgnhczw761j9kl1kfb173rla31lyyjq5f48m98h92nb07yc9xc" + "commit": "a01df752e19458c011dc838bc40a4474728f644e", + "sha256": "0dh5iil9liaxmix8g9ha0wyg788zdpmfyabd7z6sn9m7rw48vv22" } }, { @@ -32954,15 +33048,15 @@ "repo": "jcs-elpa/emoji-github", "unstable": { "version": [ - 20240101, - 935 + 20250101, + 1007 ], "deps": [ "emojify", "request" ], - "commit": "0f42d10854239b751a2ae06caa43bcf387f43d4d", - "sha256": "0pbm7yfp0swyrn8dnyf0fn6yih32wmjwji2qn9v27lkxmsm9v6vy" + "commit": "ec055ddb0c650671112fb254257f413f4755e75a", + "sha256": "1cwsc0ghcbg1ixmwc0z8vjhkyvk1dvv43lmrhcz3g0fgqiz0ff4v" }, "stable": { "version": [ @@ -33065,28 +33159,28 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20241006, - 1234 + 20241231, + 1639 ], "deps": [ "compat", "s" ], - "commit": "ed38218885b99ddccbafb8a37482228a61d87d65", - "sha256": "1n6s6a79bfj3lganag3qyc8pnnc1bavplwgq5y4wdachmiagbls9" + "commit": "ee29a3ea6459f68100e6365ac150a220b8c80700", + "sha256": "16xplsbiv1ybaws3n7xlysyqgx78haa9m260r4z8w5zfvl0h0lxz" }, "stable": { "version": [ 4, - 5, + 9, 0 ], "deps": [ "compat", "s" ], - "commit": "ccfe44bbfa79a2a4d2cab06b807d494d4e85d45b", - "sha256": "1qwbxhdcl2vvdf0sjgl1iafh47rgbabzmjjwg6jq32p7q64pw6dr" + "commit": "ee29a3ea6459f68100e6365ac150a220b8c80700", + "sha256": "16xplsbiv1ybaws3n7xlysyqgx78haa9m260r4z8w5zfvl0h0lxz" } }, { @@ -33253,15 +33347,15 @@ "repo": "jamescherti/enhanced-evil-paredit.el", "unstable": { "version": [ - 20241201, - 2142 + 20241202, + 2305 ], "deps": [ "evil", "paredit" ], - "commit": "cc5218d3487605d67056a5738a82875363c61eeb", - "sha256": "1annrn991yvqjy5nbxjkxr06xjnwa4prijlilklsc2d8a20n5cyr" + "commit": "e4b6c1fd000454d8b7730cc072069cc194f8a2bc", + "sha256": "1n26rm0dnknv206spck7cgbpwwv0xg790yb3jzp6jirbw54a59ll" }, "stable": { "version": [ @@ -33574,8 +33668,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20241123, - 2129 + 20250101, + 1751 ], "deps": [ "closql", @@ -33583,14 +33677,14 @@ "emacsql", "llama" ], - "commit": "cb104ca2f22686f94bbaba6b96eda0f22c094184", - "sha256": "0sym9q4i35cgp02vk3an52j9v9ysj1fnyv0nryi4g78jlxnawhn0" + "commit": "d28ce2f7d57c2f082506d25e653b68673daf33c2", + "sha256": "0zdlymx44jgrzm68cnh636mpdazihqiakf5m3v1c2rhvh6cb6yg6" }, "stable": { "version": [ 4, 0, - 2 + 3 ], "deps": [ "closql", @@ -33598,8 +33692,8 @@ "emacsql", "llama" ], - "commit": "f568083014664cc63eb942ee04a925634527793e", - "sha256": "1kg0jd8067brd4772sd6r0lj7vbf5pxhbj916nd6293a0hc10i58" + "commit": "d28ce2f7d57c2f082506d25e653b68673daf33c2", + "sha256": "0zdlymx44jgrzm68cnh636mpdazihqiakf5m3v1c2rhvh6cb6yg6" } }, { @@ -33739,14 +33833,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20240801, - 1619 + 20241223, + 1825 ], "deps": [ "dash" ], - "commit": "2506c058fc8cc51539e80d093c9bcdac87720216", - "sha256": "0p8b016kqnxhvpb74p54s156qqvrvw20j67if5484y4lkdzispjs" + "commit": "1ab9d567830bce355670455c0a91bf2e2730c919", + "sha256": "1gy6gxpmw2d649xyvsz4ci2h734f3pgl7ny7ckpng7s1z6p6dqkb" } }, { @@ -33787,11 +33881,11 @@ "repo": "thisirs/erc-colorize", "unstable": { "version": [ - 20170107, - 1339 + 20241205, + 1612 ], - "commit": "d026a016dcb9d63d9ac66d30627a92a8f1681bbd", - "sha256": "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138" + "commit": "998a37e950dc2ad026bdd192b37889f65d4e858e", + "sha256": "0aflxlq5gispm1zvdvbybwv4cnn42ac8dl8zc96fsly30g384ia4" } }, { @@ -34291,20 +34385,19 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20241107, - 1409 + 20241217, + 813 ], - "commit": "7cbfeee1e0d5a7645fa5931ae916eb944520fb17", - "sha256": "0v1b2aq5klpwk7jiiyyllcnyv8h2x14ah62q3d87sw6qblm0yq2s" + "commit": "11e5e81a95795b3c17dedc94d20297e20d994f03", + "sha256": "1dyy0fma0p6lm2xbyw5law0qji10zvjp8qydd4d1s162iphnpbza" }, "stable": { "version": [ 27, - 1, 2 ], - "commit": "44ffe8811dfcf3d2fe04d530c6e8fac5ca384e02", - "sha256": "1j4dihlbrfz95552fmb5dj8341w4qimnk0hv42n6yp1xz8qckcds" + "commit": "6bf99d64a0df3feceb25c166c3a3cb3f80594f59", + "sha256": "00zk0cziyylmzg63gq3h5p2p348ahg2wp5h8zhbva4h3v5w6fi7j" } }, { @@ -34995,19 +35088,19 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20240701, - 502 + 20241222, + 2030 ], - "commit": "26f49633308ea876b5850256e07622de34ad0bdd", - "sha256": "1p2lqx3rzfmn1lamnx9ns5mr0svjqamx7ah9342l30bmv87skz1h" + "commit": "62418fd8b2380114a3f6dad699c1ba45329db1d2", + "sha256": "1483a8wcnzlck789445gvq32l2hd2nxfhlbn2vjsy3j0ilc09j7x" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "c43f83983dad5f89d842450b97239bb22b5236a7", - "sha256": "0maza5vh22psfxg5qavdayqr40aw8jc95bjiz5dwm0xga55clbfg" + "commit": "8f8ab503359cd4570db2b46ebeed59085d619208", + "sha256": "1v3217r9bwlgzjx0g8m7rqqba405wx4xmsg1dm190cl10ai8xda5" } }, { @@ -35353,11 +35446,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20241127, - 1620 + 20241216, + 1709 ], - "commit": "e7b0bbc4ac40e6ea209c345042e280d3af0c6d07", - "sha256": "0ikp872gfhibc0q5rd5h5lxvnj7vqb2sqz1lbf26wy1j5bzn9lf7" + "commit": "dda9a9400b2d03b2fdae25045d2af08a37f907ee", + "sha256": "18vriqck8x85gw13qcgcn3gzv0k94y49wmqaxfcgzwg7gcv7clvz" }, "stable": { "version": [ @@ -35984,14 +36077,14 @@ "repo": "daedsidog/evedel", "unstable": { "version": [ - 20241124, - 1710 + 20241215, + 2233 ], "deps": [ "gptel" ], - "commit": "baba80b7e38935cd9209aa24867f87aa862ee4ab", - "sha256": "0alkmfrqqqpxdfj1gkxr0v1hwf8ixa6wgbd7x2pbbkj89srsp61s" + "commit": "d1c7d008fce74bc738231e18064708b2f0d4d710", + "sha256": "1p0ncycwh4y6fn8pwxniizmn7h4qlgn2ljsaa8ijbpm5rgydx9cq" }, "stable": { "version": [ @@ -36014,11 +36107,11 @@ "repo": "mekeor/evenok", "unstable": { "version": [ - 20241031, - 2134 + 20241207, + 2102 ], - "commit": "06a84eea4cf9a845266f8bde68abe25d85bd2b77", - "sha256": "0fblw7h0w40ipixa0jiwli7hrc8bw7gva61wzblw9xdb0hscx3rk" + "commit": "e39c589714c737633fd1302636526ac7cf4fadab", + "sha256": "0r9gmff6bw51mk4lqswayg697idsznzklmvxdz8k4kdvprdwkpgk" }, "stable": { "version": [ @@ -36061,16 +36154,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20241006, - 1754 + 20241229, + 1623 ], "deps": [ "cl-lib", "goto-chg", "nadvice" ], - "commit": "b7ab3840dbfc1da5f9ad56542fc94e3dab4be5f1", - "sha256": "0y2yrxrdcd0ddyby9yrygyyfvdas5zf7y090r5lcaa6l71fj1cgy" + "commit": "cc1a7bde72b38cba3f3612aac460fce57f7c3f68", + "sha256": "104kwsvz7vbhff10a9h3mrnn7ph3ylfn6fsbr6arby6cgsjp23c0" }, "stable": { "version": [ @@ -36263,15 +36356,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20241201, - 1942 + 20241217, + 1415 ], "deps": [ "annalist", "evil" ], - "commit": "ed8c652b1f49e3b01d787bf33ccb2345399572d4", - "sha256": "15ivxqdp90snkq40qvsvf86ndd6c58nsqsd87fvdp1y0f7v97clz" + "commit": "a0af9fea1dffcddd5465aa5c67fe3020acafb092", + "sha256": "1ljn7yxzywzbwzin49gl5zdniq0aizb9wf84cx1y7mzwk2yck5xa" }, "stable": { "version": [ @@ -36394,15 +36487,15 @@ "repo": "emacsorphanage/evil-escape", "unstable": { "version": [ - 20231122, - 2114 + 20241212, + 1318 ], "deps": [ "cl-lib", "evil" ], - "commit": "bdb1e69971520cbd65fe61830a1cdea5734d743c", - "sha256": "0vdmzp4hxqvng5pw3iz7flc36ndaphnia8s1cg229i8vm27lrmqy" + "commit": "aebd1a78a6bd33e5164e7552096b3fe1172d3012", + "sha256": "113srj71ayzq5wrn4zma99jbajb77xkl8rh8d19n6cbwwl028y3z" }, "stable": { "version": [ @@ -36841,20 +36934,20 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20241111, - 1201 + 20241205, + 641 ], - "commit": "19a6cad56bf1080fc526107ff48f2948f2511970", - "sha256": "1qri6gnbyblmmvc3lygil6gfinpa9ygprjd38svczj756vrr95js" + "commit": "84a6d34c1a1282c43c6ccef2ead3eaa41fd1535f", + "sha256": "06ayyw8nim5fi819hr30x54wx2ba6aqvlh7r0vld06xc0zsjdhm3" }, "stable": { "version": [ - 3, + 4, 0, - 4 + 1 ], - "commit": "1c4fefa9bb11cc4b1d7f10614d2021c12ed12e89", - "sha256": "1m5y5n38w0ijzx2kl9d0nnw70ykx2prmnvv4ip9siad71k7wpwjg" + "commit": "84a6d34c1a1282c43c6ccef2ead3eaa41fd1535f", + "sha256": "06ayyw8nim5fi819hr30x54wx2ba6aqvlh7r0vld06xc0zsjdhm3" } }, { @@ -37041,14 +37134,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20240416, - 140 + 20241208, + 523 ], "deps": [ "evil" ], - "commit": "c7899894515d6be40dfcd589fb27c1801c5b199c", - "sha256": "0nr07k1c99xdiiz5bpn0rlr2f8qvca21smpcyyxk70cxfpwksd0s" + "commit": "f4bbb729eebeef26966fae17bd414a7b49f82275", + "sha256": "0gqx0cvpi9cjr9f811ry6294bck919zblq6vib8722b2pfj8mani" }, "stable": { "version": [ @@ -38384,10 +38477,10 @@ }, { "ename": "exotica-theme", - "commit": "c3543d83fa2e0ed2b8b313f3c9e7a2c6f42b5085", - "sha256": "0jf18siqbwilx9v0mlm6v5k03c1v9jm4xdlk183bnrad09rdw6qh", + "commit": "ca71d6b596e2595f356f7848e202b2450d395f49", + "sha256": "0bzibc1s7a2qxh03573q43dw4pk1svrvh17n6nzxznag8abnndqn", "fetcher": "github", - "repo": "zenobht/exotica-theme", + "repo": "sacredyak/exotica-theme", "unstable": { "version": [ 20180212, @@ -38420,11 +38513,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20240919, - 1427 + 20241217, + 1840 ], - "commit": "541d971f7c77ca5c0f66c88bcbfeb0d165883023", - "sha256": "0i612v2v5s2yjj69wq92rm8qsm5cpqaksslwp02pf64hkf50ylmw" + "commit": "351279272330cae6cecea941b0033a8dd8bcc4e8", + "sha256": "1d6lvds7wfp9xsx5mh4x4sgync295r0bw0akmv136j5ks56xigf1" }, "stable": { "version": [ @@ -38574,11 +38667,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20241101, - 1326 + 20250104, + 330 ], - "commit": "3515a8d3485cede35e8cfcf791a83ce30d0f728e", - "sha256": "1286isnlxj5lgx7yw4m1a4k9crgc0a8in60hkcizizh3amy4jspw" + "commit": "018cc2bad2e8bf29914d39b0119e836fa0f9dc18", + "sha256": "0gr694nw01kdk5ki0n4sahyscihv6yp9hrwly8mrwcqd5bah7qip" } }, { @@ -39182,6 +39275,30 @@ "sha256": "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y" } }, + { + "ename": "fancy-urls-menu", + "commit": "4789ccf260c0c46af32fb30e35fac1d9010110be", + "sha256": "07b84sm980g4n50k73gsvpihqkx5ksjwsghxij57c1632zbd4c9j", + "fetcher": "codeberg", + "repo": "kakafarm/emacs-fancy-urls-menu", + "unstable": { + "version": [ + 20241216, + 2300 + ], + "commit": "88135b9964edd47f849830308e9be17813598432", + "sha256": "16apb0zkzrg88np7dq20jy75v1zfmd7a9l7fpqr87lwdr8zkmbxj" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "4a817ef24a91fb8e53cbece1a8351321c919d62a", + "sha256": "0zk5dnprsybnz153xqz5gwdlnvwsga7b836ygg4yrcaqwdd96ar9" + } + }, { "ename": "fantom-mode", "commit": "d03bcaa727ca822e80f50e9f2e9924be1d9e8c11", @@ -39530,14 +39647,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20241020, - 1139 + 20250102, + 1603 ], "deps": [ "markdown-mode" ], - "commit": "0b59528b738229421faf4c0b32033150902e5af4", - "sha256": "0sl1yq9c9yvb8vrmg4a4dd4x93ajpr3c8mbkiv4yxd4nrxy6myfp" + "commit": "8f0afbb5cd264033f10ba58158a5e1f3737b16d4", + "sha256": "0lmjqwq0nrimcqs3j9cadl2yz0nvg250vy2l6czg2648x6fdvcc6" }, "stable": { "version": [ @@ -39666,15 +39783,15 @@ "repo": "jcs-elpa/ffmpeg-player", "unstable": { "version": [ - 20240101, - 926 + 20250101, + 1007 ], "deps": [ "f", "s" ], - "commit": "c3808dc1c39499a81e1b9463526fda924fd1f062", - "sha256": "0j0l5239wd14bf0qjr51d0vsx5cbbsfc02qzxzs163lkp9kklzr9" + "commit": "dfc78152925c62a575bb135f320b74c1b4a71f2c", + "sha256": "1cyyw19z2aj1c62ckvfg0z07k14k2fpqw556p540yh9xdi2n0i1k" }, "stable": { "version": [ @@ -39828,8 +39945,8 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20221108, - 236 + 20241229, + 1923 ], "deps": [ "dash", @@ -39837,8 +39954,8 @@ "seq", "transient" ], - "commit": "1c48ef63a639bfe1ae4d5095725ef88a3f2c590d", - "sha256": "1y20zz6n72g4bqlfxfjlc7zgpf2qpd7q6qn13bvrn47104v9qjli" + "commit": "dfdddc02a65b7af747f053593a9c9c2db73c45a5", + "sha256": "04p9416ybq3r5m9z0ynjwam4mi84bzvzgcl3da8gg8bv39r8w52d" } }, { @@ -39895,11 +40012,11 @@ "repo": "jcs-elpa/fill-page", "unstable": { "version": [ - 20240423, - 924 + 20250101, + 1009 ], - "commit": "c04d29a83d50c9f1dfc039c05c6508f8370514fd", - "sha256": "1z0ni6llpvdh9jwmnzvpxnyy4x605qyh07pwaqck7bxl12xc3wh3" + "commit": "b72340d478eead21e409a7a380bc2a61bb4d8732", + "sha256": "0nasiwm4gzh6dgvn8xiiac4zbajgqsq550qlfdbrj29acqgr9bz0" }, "stable": { "version": [ @@ -39950,40 +40067,6 @@ "sha256": "114p7p4qby2mj6z1lz1gv4ca2cqgyr3c1v250ka9m2m46lnrml40" } }, - { - "ename": "finalize", - "commit": "1b55869b5183644de02687d2e56f9b68854ccda3", - "sha256": "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq", - "fetcher": "github", - "repo": "skeeto/elisp-finalize", - "unstable": { - "version": [ - 20170418, - 1945 - ], - "deps": [ - "cl-generic", - "cl-lib", - "eieio" - ], - "commit": "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27", - "sha256": "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79" - }, - "stable": { - "version": [ - 2, - 0, - 0 - ], - "deps": [ - "cl-generic", - "cl-lib", - "eieio" - ], - "commit": "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27", - "sha256": "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79" - } - }, { "ename": "find-by-pinyin-dired", "commit": "0aa68b4603bf4071d7d12b40de0138ecab1989d7", @@ -40045,11 +40128,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20230506, - 544 + 20241207, + 1249 ], - "commit": "889466d047ee93ab33fa8eaa4e1ef279d884f1da", - "sha256": "1vrr3fwifn3lpajh03rx5rzzgc5dks0p6154y1c7f49wqffds36p" + "commit": "53752d3ca67fb494e0854902ee54af56b200d279", + "sha256": "0kiqc451mrp9rqx84jx4d0sbnyyjx79s5nxq3chmyfv5c47wzrjc" }, "stable": { "version": [ @@ -41125,11 +41208,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20241130, - 1502 + 20250104, + 705 ], - "commit": "ebaf48359b3e21879c8f6f3c1b5d0221b345035e", - "sha256": "1spbkhsdf7crns2wr4ghs1pdfwz2ff001pbbzmcc39v5d71pb5ri" + "commit": "e2a7f331d0e3c3f74981a805ef849cfdfb5657f1", + "sha256": "1kqljl40cvzg2ws6hr993zxpgyhm5y2jag959d2w3qgvbyj4p6l0" }, "stable": { "version": [ @@ -41769,14 +41852,14 @@ "repo": "flycheck/flycheck-deno", "unstable": { "version": [ - 20240101, - 833 + 20250101, + 902 ], "deps": [ "flycheck" ], - "commit": "5e4d66865d7d91e7af3b1b69b02dd540c9ea5aca", - "sha256": "0xqp9cycpsliizl7dknpxcvnlx3mcbrqdkp8a2imjxr4ss042pmd" + "commit": "47671457b649b2de422cd56f7b3950aabc015c1f", + "sha256": "1rsjyilrj3sm1giy1g0g3kzd4g65k3x4rsykfg291cr815fa7fai" }, "stable": { "version": [ @@ -41921,14 +42004,14 @@ "repo": "flycheck/flycheck-eask", "unstable": { "version": [ - 20240223, - 1023 + 20250101, + 901 ], "deps": [ "flycheck" ], - "commit": "c1c82b359bb94cbca29f2f0fb29b7f5132691d04", - "sha256": "05p04454sd3phd4w7i7rjdz861akd8ml55pjhxsnwpacgw05w8zn" + "commit": "f93e5dd30aa9f7c612823760867c2f361fde6631", + "sha256": "0zfck269hjax9hs1y46gy6b4dg2ymhlh583az3pad99mjhdfyl2m" }, "stable": { "version": [ @@ -42194,14 +42277,14 @@ "repo": "flycheck/flycheck-google-cpplint", "unstable": { "version": [ - 20240101, - 833 + 20250101, + 901 ], "deps": [ "flycheck" ], - "commit": "2330e8ed99d89010b652dcb8e9a9a546a9e6da3a", - "sha256": "1vqrxdprflz6zx01k1rcblzsamak708ny2hgik7nf63kbibpnnzz" + "commit": "9b2f8eeb46874cbb0c34caaa91ac3cdc3d0d6f56", + "sha256": "1zrphyisppbvga44pz1pp6zhcn3jdxzb37d62w7plbb56ydrf8fd" }, "stable": { "version": [ @@ -42271,16 +42354,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20240101, - 847 + 20250101, + 849 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "cb011efcc05b111bb4638cc42c24c5b11fc5f378", - "sha256": "12xrcwixfx6w5rcavgmxrr1nxlay2f6057g0clxfzyp5mk4aw342" + "commit": "3cb1853bcdf62856604a081c0d88ae09d69f1601", + "sha256": "0rsinzcwa767hib01hl36p9b6c5swfv45fhbq7dvv6g0zm0hkhrw" }, "stable": { "version": [ @@ -42542,14 +42625,14 @@ "repo": "flycheck/flycheck-inline", "unstable": { "version": [ - 20240709, - 1812 + 20250101, + 1908 ], "deps": [ "flycheck" ], - "commit": "de96ba2eb4619a9a7d891773629ec70f2be89aec", - "sha256": "1nh28p3sf1swxgip732lh9k9bmw1k4x4z0pnjw8ihcas4xw0bygy" + "commit": "0fece8283ceb7cb941f506b9f1e3f416a1c5aeda", + "sha256": "19i578jdvcxy23ww0588y2z29hkivp30zxk2bvlcd7nxrhzanpas" } }, { @@ -42718,14 +42801,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20241018, - 1225 + 20250101, + 852 ], "deps": [ "flycheck" ], - "commit": "03d023c78cca177901afe7223ee57a8e396dcf49", - "sha256": "0s11sn0qbq3g6dwrr9r476c59zmp5fya89pf71pl02jijd4a3gr4" + "commit": "24910498ea5c9588813cc2c602de935aebb06505", + "sha256": "1m0xnq3rynzq6y6zgq6czc8jyz09gn37a13c0fyqxqd0x6x8xikw" }, "stable": { "version": [ @@ -43469,8 +43552,8 @@ }, { "ename": "flycheck-rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "02cwz9pbg6xn6ka6f9m6af1v3yqzayaln8yc9qhz1ys6rb25svy1", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -43506,8 +43589,8 @@ "repo": "flycheck/flycheck-rust", "unstable": { "version": [ - 20240205, - 1018 + 20250101, + 902 ], "deps": [ "dash", @@ -43515,8 +43598,8 @@ "let-alist", "seq" ], - "commit": "4d365ed1c9e8b8ac43561eb365d37ab555a6e617", - "sha256": "0qdbmy7g8pmaml7sdi9bfpadlb69cyavicwi0w3zb9fbhwqjzbpv" + "commit": "d499471ec433a62898a95ce76561964e3d015ce5", + "sha256": "09vjwk1k0z3lrl2z1hdf59v9cc2k3sac3vy3s6gcf4az9kvq38zh" }, "stable": { "version": [ @@ -43964,11 +44047,11 @@ "repo": "jamescherti/flymake-ansible-lint.el", "unstable": { "version": [ - 20241026, - 2053 + 20241202, + 1538 ], - "commit": "0503a9b7ace1d0909ba5d20f9474451621c2011a", - "sha256": "0bfv9mpxdd767gxjgyw56h8z18gbhrjl6rqv57wc30vbc3p5frpv" + "commit": "a68530a0aab9a83382131b46bcace12505c65d29", + "sha256": "0nddzhc4jv1lmja1y0f1cafyiagrywcf9brb2yagcv1jhzxjnkcq" }, "stable": { "version": [ @@ -44003,14 +44086,14 @@ "repo": "jamescherti/flymake-bashate.el", "unstable": { "version": [ - 20240918, - 1343 + 20241202, + 1536 ], "deps": [ "flymake-quickdef" ], - "commit": "71acb57748694e7f18de252d4f808e12bfa07fef", - "sha256": "0ng19madpkvm0mh5lnq51gdvmqv56la1085b94pzipl772z8sly3" + "commit": "b3a1031f95b1521b7b12f069914c9f8b004372fc", + "sha256": "12lwc81d149dyzwvjqm4ibj1k8vf88qs0m9qq661c5jcxchzz7br" }, "stable": { "version": [ @@ -44092,15 +44175,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20241117, - 1157 + 20250101, + 2151 ], "deps": [ "flymake", "let-alist" ], - "commit": "1b62fd9b5844b231cb48b4919064420d64a123ff", - "sha256": "0rqviv2m50f2z4kigylfpyprldi5y0hsc69ni1cc84jnwwn8x915" + "commit": "5de95adb4c4981cee2f6152ef934230d7b2934eb", + "sha256": "1jx2y724xgv238nv3dxgvl1arjzg018vmq5jqy8zcbq21nrmwwgq" }, "stable": { "version": [ @@ -44228,14 +44311,14 @@ "repo": "flymake/flymake-eask", "unstable": { "version": [ - 20240223, - 1022 + 20250101, + 1000 ], "deps": [ "flymake-easy" ], - "commit": "0e83cec77aab54365ef8d604151888bb1f61049c", - "sha256": "08939vsg1mqs3syngr70vakabrvrjbbna7im6b1gjal8qjz22cxn" + "commit": "96fd80e6ff2c34a5898906388cfb6462f9bec7f1", + "sha256": "0n14xrgq56pyfh04f2gkw2fcmn64j2adhdpzm41vvxi5fr5pca7a" }, "stable": { "version": [ @@ -44504,15 +44587,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20240101, - 846 + 20250101, + 849 ], "deps": [ "grammarly", "s" ], - "commit": "b0041adb03ba1e9a3f20656a475042451868aa19", - "sha256": "175l2r6abayin9xnhbyff7kywygiqkfaynrak0wzx0hgzmgsq1qc" + "commit": "da1e8030e0148d098bf2cb66ac5402beb1d10825", + "sha256": "1nccblkrlijspzgg1fal4fw4chyp81ava63ax3wwy3l7d6nk2yg9" }, "stable": { "version": [ @@ -44608,11 +44691,11 @@ "repo": "DamienCassou/flymake-hledger", "unstable": { "version": [ - 20230710, - 1945 + 20241226, + 1937 ], - "commit": "b42b66186688fbe8dc904d01d9a5378456e011c9", - "sha256": "0dx7zky6nfcajpvkgn2jmdgw9b0k6pjsl7my3vcbanvg0863g9il" + "commit": "3dd9d58ccd8e4c22c14553ebfac0ca1be3efebc5", + "sha256": "0dysfq6k5dgcv1chshs99b9hc816dk5a8pbx1m08jsdjsy92zaaw" }, "stable": { "version": [ @@ -44791,14 +44874,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20240307, - 419 + 20250101, + 852 ], "deps": [ "compat" ], - "commit": "73a1814db4cc387854d72828c0e188c9f5b4c661", - "sha256": "03sgfygr0jp3h7lnjl6v7j8rrcj5ib8qrvvijlqpk62vjh2pn4gc" + "commit": "c9b6749c5b17a8e58931cf2ce3ab5cbb855ae75d", + "sha256": "12sjiwxngv069c08vz2x8n49kcpwf7qc679lf7gh44dmyj0fs8fw" }, "stable": { "version": [ @@ -45236,14 +45319,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20241016, - 1600 + 20241214, + 532 ], "deps": [ "project" ], - "commit": "17a8345f95761090d86e7c97d14f58fad77c0e29", - "sha256": "07lqqvpnaffc77aczg5d7p9agwhlqllj9pqiyf514bvrr4nn2jhr" + "commit": "b877f47eb9da608a40cc1bc25826d2176494bf6d", + "sha256": "0wpcwvnvldm99i0wbvsbxm8bz9acsis8ihp7wp1xd185p8k5cilw" } }, { @@ -45918,11 +46001,20 @@ "repo": "Lindydancer/font-lock-profiler", "unstable": { "version": [ - 20170208, - 2008 + 20250104, + 2246 ], - "commit": "6e096458416888a4f63cca0d6bc5965a052753c8", - "sha256": "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5" + "commit": "6f19fda11de06f5f6c5b3732f056df762d685fcc", + "sha256": "1cjgn91yyha14qqw9gdv15d0a19mjlx5ixigrysks60r6jkzzphi" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "commit": "6f19fda11de06f5f6c5b3732f056df762d685fcc", + "sha256": "1cjgn91yyha14qqw9gdv15d0a19mjlx5ixigrysks60r6jkzzphi" } }, { @@ -45933,11 +46025,20 @@ "repo": "Lindydancer/font-lock-studio", "unstable": { "version": [ - 20220629, - 1909 + 20250104, + 1653 ], - "commit": "78472ae1f65721b4da17756ee7e506f3d0487033", - "sha256": "0gyzl2rz9kzrpvb3pfkcwbd0b7rxjxlklzc7zfh7ch6xxg0ghslw" + "commit": "fb932d8eb7d305ee4dcc6f29bb5e56cfb3fe9104", + "sha256": "0ssa62qm3zv0l9adz0bpi4iaixbi788ihh1qy5n41h6jzcjig4k4" + }, + "stable": { + "version": [ + 0, + 0, + 9 + ], + "commit": "fb932d8eb7d305ee4dcc6f29bb5e56cfb3fe9104", + "sha256": "0ssa62qm3zv0l9adz0bpi4iaixbi788ihh1qy5n41h6jzcjig4k4" } }, { @@ -46169,8 +46270,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20241201, - 700 + 20250101, + 1813 ], "deps": [ "closql", @@ -46185,14 +46286,14 @@ "transient", "yaml" ], - "commit": "8f9e94949f4490273c4991b45f1ef02b9503dfcd", - "sha256": "02d5wxv0hnpjf83az96jz8hbldfp48za80ql0xc3ccah6s0hp7mn" + "commit": "0c9060626200902f7b0078a85566ef0eea8cc0b6", + "sha256": "0mh542c9hy401jcvammd89v9ja3zxc16k7zhfflq67x90987mwhp" }, "stable": { "version": [ 0, 4, - 4 + 6 ], "deps": [ "closql", @@ -46207,8 +46308,8 @@ "transient", "yaml" ], - "commit": "a63685b921f25e861bf1e172e46beb771e56b924", - "sha256": "1nrr3l19p3hcm4jyghkl16d1pn0nqq6v6s19s54xl5yzjxfj44yq" + "commit": "0c9060626200902f7b0078a85566ef0eea8cc0b6", + "sha256": "0mh542c9hy401jcvammd89v9ja3zxc16k7zhfflq67x90987mwhp" } }, { @@ -46436,11 +46537,11 @@ "repo": "gmlarumbe/fpga", "unstable": { "version": [ - 20240828, - 906 + 20241224, + 1805 ], - "commit": "2c1b20fde1030208cddb4e50a56821a33f2b1323", - "sha256": "1j0hkbhhk9npiafjq3s4vyaw8f9j9skqnajjia4n18l4ga7wc7kc" + "commit": "7ba64134609cbb9b7a5dd3b960985fa46a582cf0", + "sha256": "0sl3s5bfqmicpg4hp2k6qznrgj71dx0lz3dv2jyd48ys67m9x4dx" }, "stable": { "version": [ @@ -47254,26 +47355,27 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20241202, - 6 + 20241208, + 2139 ], "deps": [ "compat", "flx" ], - "commit": "5c8165619f4c94f7f620df69ab67d7d5bcd15501", - "sha256": "1vcqf3pjmhqfsppjvdx0lzqxzr1kia5b21ypdhqxx3b8splg86si" + "commit": "309614c3acbdca9d0a50827e94c2ac8cda11f420", + "sha256": "10vdzvd8pry732mf7vhn3v3dhnnd4pngcvcm1smlimmc4pg0hhw7" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ + "compat", "flx" ], - "commit": "cd2c93b9b5fd0fe6c61fcc6e1d62b4c1cbb142aa", - "sha256": "11i6228xbw4g8ks2z073lzdrsmyilppr1dbcg91r9y267ppl1ijw" + "commit": "dd66f96400797f8db5e6335617fafe41340df85c", + "sha256": "1120ry2aa97jgjlzz0cpwxm0frks2vqp15i6vfjpnvm6fj09pl9m" } }, { @@ -47327,11 +47429,11 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20240101, - 830 + 20250101, + 843 ], - "commit": "295140da741ac02c1bd3dec69ccf7f6268d60ec5", - "sha256": "03ryz1793bbab7c6nmya2n1xzjsliidhy5kzrcmch8vlidrgd12d" + "commit": "09ef98ecdea03497ae309fd0ed740190e9a3492e", + "sha256": "1szzbkvb80hdz3889q1jb8jyn8fzdxsxrmz6qk8w9x4cc7xw70gf" }, "stable": { "version": [ @@ -47350,11 +47452,11 @@ "repo": "10sr/fuzzy-finder-el", "unstable": { "version": [ - 20210906, - 217 + 20241219, + 1044 ], - "commit": "915a281fc8e50df84dcc205f9357e8314d60fa54", - "sha256": "15b6nbkv8xpvin8i1443s1mnpag5p33asgwpxijrmwp3xm2xkyl6" + "commit": "ed3fb35d33b38d5baad49ed5a2ea046085de4498", + "sha256": "0fqdd9mb81mpi24n517rb6bbm3bi6dymnwcz3kpxydkm65cjvmzh" }, "stable": { "version": [ @@ -47495,11 +47597,20 @@ "repo": "Lindydancer/gameoflife", "unstable": { "version": [ - 20200614, - 1814 + 20250102, + 900 ], - "commit": "2483f3d98dbcf7f1633f551cc3691f5659b4b942", - "sha256": "1a57fc8ylrdlqlywp81b71jd93hiwkxy6gxpi8358d6d4czslvq7" + "commit": "5f4ac265928bfd88765d057b44cebcef71a7aaf6", + "sha256": "0ag9qfdjrg6x7aip3drar4gnylgimnk30k24cd9a4i72500fc6qs" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "commit": "5f4ac265928bfd88765d057b44cebcef71a7aaf6", + "sha256": "0ag9qfdjrg6x7aip3drar4gnylgimnk30k24cd9a4i72500fc6qs" } }, { @@ -47651,11 +47762,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20241104, - 821 + 20241207, + 610 ], - "commit": "bee7f99c6f780497ec112bf01196181fc83511c8", - "sha256": "0808lgdca1vpsj1rwyvqcxrqiq60z9ww5yjsrg7fg28c9vba44b2" + "commit": "c3d99889843db92fc6e4c51226c222779eadd7d6", + "sha256": "1bh7icz4k70x62z50lnjgnrxxh0mhlgrj421wm4sqiphk30vmck4" }, "stable": { "version": [ @@ -47840,14 +47951,14 @@ "repo": "emacs-geiser/chicken", "unstable": { "version": [ - 20220717, - 1130 + 20241204, + 1442 ], "deps": [ "geiser" ], - "commit": "a480598b5908c95bc8d3178a48f13e9072a9235b", - "sha256": "0jb0zlg82axp44iy51w7fh96z3pmn2k1idipznhw90hkr3wkiiqw" + "commit": "5f2c1bb446af6ae4aec9c8d74d4ecb34031706fd", + "sha256": "0bzax5fsmjxzinp6rhwrbqbass0pja89khl4adbdp8mafqp46jpk" }, "stable": { "version": [ @@ -48307,16 +48418,16 @@ "repo": "twmr/gerrit.el", "unstable": { "version": [ - 20241014, - 1940 + 20241218, + 820 ], "deps": [ "dash", "magit", "s" ], - "commit": "58e5bbe1485cb15c02b74c327fac6a533e8663da", - "sha256": "1v2akprnfmc89iq68aprydgb28lrj497jm8bgmkf8cwljf4x1kh5" + "commit": "62ebf2b3d32b9a235103d12e1b131b0c3f42a10c", + "sha256": "0zzzm89s11b3zv3s8l5j5xhnmzzpv4qridqgszi19krgw37adb8h" } }, { @@ -48615,30 +48726,30 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20241123, - 2135 + 20241208, + 2219 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "4f39b86544ab064204efd0dda381af90fae70f43", - "sha256": "1dxcm82q23djj51ic7j2702jyaygwganrsrcd3fpvg2nw3r5gz7i" + "commit": "97edaf450ef74f40e6c0bd6a35ebd3fcb710ca4d", + "sha256": "1dlvhpwz4i2z70xh4rzkq8d1wfhbc6n0hp17kdwsy5x5d891dczi" }, "stable": { "version": [ 4, - 1, - 1 + 2, + 0 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "23d1cd6b089db6619d02d66957c6a274311abd60", - "sha256": "1p5lx781z603q943p73p6q9k6qz75ldjwrr9z3h6zvi80gxd7afy" + "commit": "97edaf450ef74f40e6c0bd6a35ebd3fcb710ca4d", + "sha256": "1dlvhpwz4i2z70xh4rzkq8d1wfhbc6n0hp17kdwsy5x5d891dczi" } }, { @@ -48974,28 +49085,28 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20241029, - 358 + 20250102, + 1432 ], "deps": [ "dash", "transient" ], - "commit": "7b73709928770959ef731192726ade76f85da877", - "sha256": "0225n41dcqm53c4nl0m9a17zg63gnqf90cfhp777vjdfry0mxsfl" + "commit": "1a8bed36236338815d5f3c1420d4e6ac9a88ca0f", + "sha256": "1s1iq1cnhqn5xh50dcbc7ppl9706ajri9j5dz6sjss5wp0v0n2lb" }, "stable": { "version": [ 0, - 7, + 9, 0 ], "deps": [ "dash", "transient" ], - "commit": "14be943b04c1a0e9a0771bc6fc748d0e961af825", - "sha256": "00bis5dk15wrmccd1pla87z2cbr5fgqg6gqjvkn7iry73sax8c61" + "commit": "cc03ce1e7dcf6fd139453ef2cba02fcf98acd6a7", + "sha256": "0c6pz4wcr1fkymnb1gx19n8qr48zl0nhlz262r4i6rbp1838507m" } }, { @@ -49031,30 +49142,6 @@ "sha256": "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9" } }, - { - "ename": "git-commit", - "commit": "301c815541da7eaa552d834bfbed3e6633bd4136", - "sha256": "1xqcj7pmlys3ml1nk5fhgqn6d4nr1aagk8z0lskgr3kxzw5n7bcq", - "fetcher": "github", - "repo": "magit/magit", - "unstable": { - "version": [ - 20240831, - 2335 - ], - "commit": "9be8a4ab7a7dc6f34615f1011e8da263651c8f87", - "sha256": "02i9j8hxp3v1pd805x7xxd39kqldq2kw5qyxdwsrw7lyia25wrji" - }, - "stable": { - "version": [ - 4, - 1, - 2 - ], - "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf", - "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72" - } - }, { "ename": "git-commit-insert-issue", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -49181,11 +49268,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20240903, - 418 + 20241212, + 1415 ], - "commit": "9beaed9e45f92ab0527f54dbf5fb241b84e7821d", - "sha256": "0vz6ms419kidlsfdv6w22imvl7y7zr3qv2c5xlvdxgi8kyr2k9p8" + "commit": "3bdead17db7b84270c00e5a6b5ad02fa87ddd52e", + "sha256": "0c4fb1hcz6xl13yqw1vn7blxyzn0zyhq0zayxjsivv4x4xjm7y2p" }, "stable": { "version": [ @@ -49196,36 +49283,6 @@ "sha256": "0qjp1gind95py0zfc3a32j7g6bmdh0pszpyiazqqzxm3rz82m7rn" } }, - { - "ename": "git-gutter+", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "02f314ks9hv8fgbajq1cci3gd9vycz08w87xngz3wa8r1f7ga6gc", - "fetcher": "github", - "repo": "nonsequitur/git-gutter-plus", - "unstable": { - "version": [ - 20151204, - 1723 - ], - "deps": [ - "dash", - "git-commit" - ], - "commit": "b7726997806d9a2da9fe84ff00ecf21d62b6f975", - "sha256": "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "git-commit" - ], - "commit": "f8daebb6569bb116086d8653da3505382e03d940", - "sha256": "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb" - } - }, { "ename": "git-gutter-fringe", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -49259,37 +49316,6 @@ "sha256": "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan" } }, - { - "ename": "git-gutter-fringe+", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "18h9jkp5blfw4lgxh36x51wjh7fh669q4g7qsifj3lhg595lb757", - "fetcher": "github", - "repo": "nonsequitur/git-gutter-fringe-plus", - "unstable": { - "version": [ - 20140729, - 1103 - ], - "deps": [ - "fringe-helper", - "git-gutter+" - ], - "commit": "3857d486e5b3eca9281fba1c76756cb39a9f9866", - "sha256": "19sz3gaffirr95n4a8jag9wsqa86fpdn13k685lxrv5317h8iqfh" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "fringe-helper", - "git-gutter+" - ], - "commit": "ce9d594c0189e78d78df26a0c26bbcf886e373cd", - "sha256": "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9" - } - }, { "ename": "git-identity", "commit": "ebad3a7a81fbf0293ac04ba319929c8b24bb98f5", @@ -49371,11 +49397,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20241022, - 2208 + 20241208, + 1850 ], - "commit": "8df5f1f0a70c0668bafb1b70421b651df3bde999", - "sha256": "0fy0v3w7w23ch9z9bkjg7ssplgb5v8vng73c1xd2csja8kfkcirv" + "commit": "40f7b1674d2c703199ff2f82b464f17aa6f61b4b", + "sha256": "0cqc76pqqdhv7fgfsfyq8ych184gbmyvfh0h7a2zyh5wl2p7kb0i" }, "stable": { "version": [ @@ -50548,30 +50574,30 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20241115, - 1041 + 20241211, + 1054 ], "deps": [ "compat", "emacsql", "transient" ], - "commit": "eefd0abb3cb7ca8a09c249686ff67555724624da", - "sha256": "1g6a5vr5cqnjf15idzqnh6p377dia3bz8x260kiyf157n3h11ms8" + "commit": "852c3e25eda24471100ea210f7b0ecbb0225136f", + "sha256": "1ccx49f8lh94any0m246wnna7xcb8zhjmsw9c16g9qk6gmzv9fng" }, "stable": { "version": [ 0, 4, - 8 + 9 ], "deps": [ "compat", "emacsql", "transient" ], - "commit": "b30a06fc16c18b6de7d5a21facf2b5fd8d90b613", - "sha256": "1y9f5ms7aivwjfc951m68jfmwncfq5f4h876xvivxhfph4xnc76y" + "commit": "383f8b489dbbc7fd13b076acaad10ccf73e1dd48", + "sha256": "08pqz0xfih761hmaq1hs3fzmkxn2jhzfbkqrkisl84ayla8shnrn" } }, { @@ -50760,20 +50786,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20230602, - 957 + 20241218, + 1308 ], - "commit": "5f85ddccd116b6c0cddf47795f25f930b7b767c4", - "sha256": "114pq08a8i9362lp8h6lgky8pd1mcf93lw50zq2qigwixac5cp7m" + "commit": "9cd9797c2aa54be4ca03b5ca0c50b64c4dc1d34e", + "sha256": "0fjvshab1fvjbvsfn7vk16lxzq2552w11gry12rixsaqps38bsa6" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", - "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" + "commit": "9cd9797c2aa54be4ca03b5ca0c50b64c4dc1d34e", + "sha256": "0fjvshab1fvjbvsfn7vk16lxzq2552w11gry12rixsaqps38bsa6" } }, { @@ -51588,11 +51614,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20240926, + 20250101, 919 ], - "commit": "142d788e16bf387608b51c8590c852940890f637", - "sha256": "0bvr5696i6zbzd160hf0fivxil3a65p22x7vagwydxrx9d2ji4iq" + "commit": "d71e85ff8d9e7f8966e4cccece3efa545afc41da", + "sha256": "1pvgfhy8a1cmip9vx31lbdm4957hz4gsj2a875gvc8xfl2y4dc3r" }, "stable": { "version": [ @@ -51948,6 +51974,24 @@ "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" } }, + { + "ename": "gotest-ts", + "commit": "86837556b6cdc831bb4bb387a0840fe6186ebedc", + "sha256": "1fl8cyykfq9myrs8p5240mp2jh3lb1p5f0fgvrq0bw7cj4rp9306", + "fetcher": "github", + "repo": "chmouel/gotest-ts.el", + "unstable": { + "version": [ + 20250107, + 1017 + ], + "deps": [ + "gotest" + ], + "commit": "ede3685388e76ed379b184cc62275bcdf819f104", + "sha256": "1lpy33d65cdxk6sqpsirijmyng7h5v4a397q11h16br14vpx47i8" + } + }, { "ename": "gotham-theme", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", @@ -51980,11 +52024,11 @@ "repo": "emacs-vs/goto-char-preview", "unstable": { "version": [ - 20240206, - 139 + 20250101, + 908 ], - "commit": "d40eb8c1e8844ab7d265197191a759f62bf1099c", - "sha256": "0z4fd6y3cikxgvc86bx2fy04kd136bkh8qymiwsx24i3pa4zwr4b" + "commit": "806baf183ca6f6c88aea7f79752e48c4f2f86c89", + "sha256": "01r828qpx9bz27nj4d2xj5sdzi5q71nfji21h735bn4r6q6p9hk9" }, "stable": { "version": [ @@ -52067,11 +52111,11 @@ "repo": "emacs-vs/goto-line-preview", "unstable": { "version": [ - 20240206, - 138 + 20250101, + 908 ], - "commit": "4e712da4e5e90b02440bd1f435a89ad02ff5a894", - "sha256": "0khcc8qgc9x77wr4lpxjjahcimxk015ikp3lin02lm1pp28a5wa5" + "commit": "fa34955bcd1166421757216013945bc9ed520dc5", + "sha256": "0x34xkg5g630yiihyqq09l21bfxvz0iz83fw470sq4j3qm6hnykr" }, "stable": { "version": [ @@ -52106,8 +52150,8 @@ "stable": { "version": [ 0, - 46, - 2 + 47, + 0 ], "deps": [ "dash", @@ -52115,8 +52159,8 @@ "magit-popup", "s" ], - "commit": "c3916ff7728451023ce84c2eaf726b1d23e623b6", - "sha256": "1jr9zwknxbz7f4vlnfjzzslzxy05m24x857rsh4aj9mnwawdppc3" + "commit": "95396cdfbb5ce4929e5fc1cf8d3e191408e319b4", + "sha256": "177v3lqhaf2yjkl416g3iimf5sz42vn1j31wldmvadk2risxxi9p" } }, { @@ -52166,11 +52210,11 @@ "repo": "brownts/gpr-ts-mode", "unstable": { "version": [ - 20241127, - 2221 + 20241212, + 104 ], - "commit": "2f23e4ca2225c614314b4d66ab5312dd9cfdd419", - "sha256": "01hdip8ivldz00r3ci96zz5m2i2jc18272bx4riy7gn08sw5cdxs" + "commit": "4790595bb0a6108a27ee8600dd36dc10d3c9afea", + "sha256": "0wv2xshr5ws2v1c5p4jyqp1ad7panm96kzi0qfjgng4kfvvsfxb6" } }, { @@ -52199,11 +52243,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20241020, - 1841 + 20241208, + 1724 ], - "commit": "3f3d0c4c1f2d5460ed3296a63c7938c5040aaa8e", - "sha256": "1prb83vwr16jya920lbbd6pfk9xbdm6fh81s30j3jqyin3vpjkhq" + "commit": "3575afcb3c379f9067ab80eefe696f3758564397", + "sha256": "0q836g45kwz7a6qrpjk771si3a8rbfvfx376syffvwxb5kmw38h1" } }, { @@ -52270,28 +52314,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20241130, - 1959 + 20250103, + 1837 ], "deps": [ "compat", "transient" ], - "commit": "7934106b74ce60fd5782e840c7efc4f0bbdbc646", - "sha256": "1rmfaymci96pf0qmy12cpgsyly04jzy93apa7bdjjnj017pshsyx" + "commit": "7ac9201b84f3d132dce0094d135a525ebcfafa12", + "sha256": "079yk4mn0ahwlc7vv4w3bvdqm4nvs3gm9wch9xds80dlpgvyl85m" }, "stable": { "version": [ 0, 9, - 6 + 7 ], "deps": [ "compat", "transient" ], - "commit": "f24e5ad4740ce5f9829b14e499c9181f9bd7c76e", - "sha256": "0cb5wxlc598fs1cmjvkbc76x098ljmik3s39hjfjzn6537yps4da" + "commit": "5a5cddb93d610bd59ec52a070b0f89a9ec842152", + "sha256": "15ny2d04ci04swmxikkyb7lsjr51gvxpr2cj02gwx88bidx34md2" } }, { @@ -52349,14 +52393,14 @@ "repo": "xuchunyang/grab-x-link", "unstable": { "version": [ - 20191113, - 848 + 20241223, + 1442 ], "deps": [ "cl-lib" ], - "commit": "d898db46e4864118359fdedfe915e180de3fe290", - "sha256": "0npz0da2rcckv0zcf2f8vpjcdnii3z99x6c5c4z7jd4xgkp004xs" + "commit": "4aecb0f360320e0a58b4b142d247b1e628612574", + "sha256": "05a9f62gn1r283agkirvvgzlz4mv56vwwadvyggpas87lmzcp0h5" }, "stable": { "version": [ @@ -52455,16 +52499,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20240101, - 846 + 20250101, + 849 ], "deps": [ "request", "s", "websocket" ], - "commit": "813944714a04ae2a3cdaca845c1c9d70ced462ca", - "sha256": "1v80482vcx9p7fm1crg9vwwrjvb2q1xpkkpxl4fpycd64wimgdk2" + "commit": "c67f8d49bf89fb176e4a125b8fc4be4a41446a95", + "sha256": "1r9vbkqz9ynawyn7v98lqcadjdns6kyndazsbksxqd3myvf6m6la" }, "stable": { "version": [ @@ -52765,15 +52809,15 @@ "repo": "michelangelo-rodriguez/greader", "unstable": { "version": [ - 20241025, - 1237 + 20241231, + 2331 ], "deps": [ "compat", "seq" ], - "commit": "0977a4aea839a6f3907d5475baf4012151a4e556", - "sha256": "1jhscp9q5b9qdg9b6k5vypgmnj7hgflx6a68v7b5pg0qj2rxxk8p" + "commit": "a7a8d4adc4f4590669cb8cbad086db12d831ad82", + "sha256": "0k954p27g6i0ing3gbkzx40g3wisd6wy5p2fjcmq4xxqn18icv20" } }, { @@ -52922,11 +52966,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20241111, - 936 + 20250104, + 1058 ], - "commit": "d6c7e33e40d10b529b059ea1d237161dc3e88428", - "sha256": "0918ycvbfv5ckmgvjn413v39bz7948f03sjqw6wzcha88hgdizv6" + "commit": "df0ba7589db7c54c4b68bd6a96a246676d7893c3", + "sha256": "0kmvc7yk9p04iz0jzg0iqa9m2q4v91q9yrl4y6vsmm45diy7r60z" }, "stable": { "version": [ @@ -53654,11 +53698,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20241118, - 1802 + 20241204, + 736 ], - "commit": "3b13b5dd594d6cc5798117f216b266d86f1ffa16", - "sha256": "19wk54k2z0s073yk84f1wq76a28srqd9wsh1qhs8sr26vjldg24y" + "commit": "0609b1bb31340419a458618cc9909f6ba0351357", + "sha256": "0br510904vfq12g464b14h4a6rbiphhn9i9qa37msgfzl78q6mac" } }, { @@ -53998,6 +54042,29 @@ "sha256": "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5" } }, + { + "ename": "hardtime", + "commit": "96f0528a340d145366cad31acbe5e033603c7e69", + "sha256": "0pssclhpdnjr9jdks85118m0adbxp8ggl020b0qhxv2a12kc8mjf", + "fetcher": "github", + "repo": "ichernyshovvv/hardtime.el", + "unstable": { + "version": [ + 20241203, + 1647 + ], + "commit": "a14df12bda3951e53553426629f4af7a638f6eee", + "sha256": "1jzb20s6m2sv6bkk7rsaizlxx5v7aap92934ml2mj43ry2gzgvpd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "a14df12bda3951e53553426629f4af7a638f6eee", + "sha256": "1jzb20s6m2sv6bkk7rsaizlxx5v7aap92934ml2mj43ry2gzgvpd" + } + }, { "ename": "harpoon", "commit": "1b8efde9e17f716c518a0cfe8e65ba57cf662b48", @@ -54213,29 +54280,6 @@ "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" } }, - { - "ename": "hasklig-mode", - "commit": "15a60278102de9e078b613456126945737718ce9", - "sha256": "0gz0k9ahk0jpdp893ckbby9ilkac1zp95kpfqdnpfy0a036xfwm7", - "fetcher": "github", - "repo": "minad/hasklig-mode", - "unstable": { - "version": [ - 20240102, - 333 - ], - "commit": "9933e55765f006322c7db4ff41c1c5789295768f", - "sha256": "0h6wk7y96h803n5215shb88vszpqahsr54af2zgw1h5s22x32xv3" - }, - "stable": { - "version": [ - 0, - 2 - ], - "commit": "4b73d61f4ef1c73733f7201fbf0b49ba9e3395b6", - "sha256": "12a5hgaf2z6prqx45n6y0xyknz2sivpzwxjnzbsdx9sw6rniqm57" - } - }, { "ename": "hass", "commit": "d9f55bfa87d6fbaeafe713f8862369ea013a0c67", @@ -54486,15 +54530,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20241130, - 526 + 20250104, + 1759 ], "deps": [ "helm-core", "wfnames" ], - "commit": "3ca35edd5a5e8f1bee1b03facbbf44df8c729e3f", - "sha256": "00xfzw7nvas0x68s9q4s3k737jgrganqyizvr10pybqjyhzlllzm" + "commit": "3372d13b928ffc3977516eb5a397ab3a555559ce", + "sha256": "0156kjcyx7s34clz3m2qbfsn6ysvj0savwxlqd2lp5x3bqavyyz5" }, "stable": { "version": [ @@ -55375,14 +55419,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20241201, - 648 + 20250104, + 1025 ], "deps": [ "async" ], - "commit": "05c2a8262fb47762bbd7112b8149578b02d4e44e", - "sha256": "06x4xlbq63h4mjr3hcbp9kdaz0xhzlph2z5knhmglny6riqqilyz" + "commit": "01b50bc4e427bb9e16581da2ddf34848297b5c59", + "sha256": "0v3s9nn28w5rgkgk2ivlazv3z5kl7had81pc2q1k6ffr7g9dkjr1" }, "stable": { "version": [ @@ -55557,14 +55601,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20230922, - 1111 + 20241222, + 651 ], "deps": [ "helm" ], - "commit": "fc1c097cc53dd3451bfb49ea7e99fdfc6d93bc16", - "sha256": "1fypysfpl8n6np7mz2wrfy3clhbyy8lnr6c69nlxxs4nznlwyvip" + "commit": "6114ef3171cad09c74ac0028db58fb479f3c5d21", + "sha256": "07pnzpr67fxam2qih6b3miyb84g27b8m4m37z1mdk4297qr060a5" } }, { @@ -57687,14 +57731,15 @@ "repo": "markus1189/helm-proc", "unstable": { "version": [ - 20161006, - 305 + 20241230, + 1732 ], "deps": [ + "cl-lib", "helm" ], - "commit": "576d31c2d74ba3897d56e2acd2b0993f52c2547c", - "sha256": "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7" + "commit": "86265218415c7b26cdc3c25de03d063196ba566a", + "sha256": "15r4xnhy142g0l4bwhq0xrahkbisndsnzcdj47kgah4h9d9bz74m" }, "stable": { "version": [ @@ -58167,8 +58212,8 @@ }, { "ename": "helm-rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "0dw0kg21aqk74czwpwxpz2p6lg8glj8n1y5zzmqxan9qjwbrwld0", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -58306,8 +58351,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20240101, - 827 + 20250101, + 844 ], "deps": [ "f", @@ -58315,8 +58360,8 @@ "s", "searcher" ], - "commit": "893ef3864596412093876657e590f61d4449b487", - "sha256": "1hxmy6vlxjngkj8v1vw16jhladln0b3c0hrykm30060grr3w5dss" + "commit": "a87a6dfcafbe488e166ae0eb8e3e4ca7d9a3a25f", + "sha256": "0n7ipkwdg5zsbk7jff8kqsm4792mia03x5ncjj4bk5vz00p5db5c" }, "stable": { "version": [ @@ -59682,11 +59727,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20200820, - 2328 + 20241229, + 2012 ], - "commit": "cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6", - "sha256": "0wh1sfbbbz52ppr0fkl0csc4n46ipx36dli9pp9nsvpz9r28pc1g" + "commit": "3205abe2721053416e354a1ff53947dd122a6941", + "sha256": "1w8qqgvviwd439llfpsmcihjx4dz5454r03957p2qi66f1a7g6vw" } }, { @@ -59828,11 +59873,20 @@ "repo": "Lindydancer/highlight-refontification", "unstable": { "version": [ - 20170211, - 2024 + 20250104, + 1619 ], - "commit": "32632897d88c4611fadb08517ca00ef5cbc989b6", - "sha256": "1k6af947h70ivkj31mk3nv2vkxlfpqvpwq8za53n2l7adsjdlf73" + "commit": "31ce7f8086a85144695dc6c972bad9f1199bd179", + "sha256": "1f3mgsm8jyym6i04ygaq7xb5ab17ca3lrgyd5dfx66qqq231ss2v" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "commit": "31ce7f8086a85144695dc6c972bad9f1199bd179", + "sha256": "1f3mgsm8jyym6i04ygaq7xb5ab17ca3lrgyd5dfx66qqq231ss2v" } }, { @@ -59959,11 +60013,11 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20240321, - 1324 + 20241209, + 1501 ], - "commit": "6c2c7f354a0bed95b2199e1814342620119bf13e", - "sha256": "07hih5q0n6af1cr33ilzri3y3nqdmvqgd860qa9wv5wl3s8rymnz" + "commit": "934e8f8741e3cfff577d7119eceb2cfdb7cff6f3", + "sha256": "1pwn91d7x39np5i9b0d0mi48bxqv7d7h4fmg4ifhwgvglzla3r96" }, "stable": { "version": [ @@ -60004,6 +60058,21 @@ "sha256": "1hx0sj5afy0glxr3lfr6hvnk0iphmfnfg3wilx2s013a5v0drmxc" } }, + { + "ename": "hindu-calendar", + "commit": "ed2c4cc0ce0a0da9863f27cca3abf18f1c198e33", + "sha256": "1rb8cp301nn8igqswcmmava1gsj8w41fs9hjy9abdvj8h7hx32ka", + "fetcher": "github", + "repo": "bdsatish/hindu-calendar", + "unstable": { + "version": [ + 20241220, + 1951 + ], + "commit": "057fd579c5d3ca69a11d130bf7972efc9fe2e83a", + "sha256": "0v1srz1727bdxg3n96gvcz307majj2yb8hpp15wz53irgbpf9y82" + } + }, { "ename": "hippie-exp-ext", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", @@ -60209,11 +60278,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20240422, - 126 + 20241208, + 459 ], - "commit": "c182a54a5ad0c7757be7fd5f18223528614a119d", - "sha256": "0rmdq00cgjfvi6pfcsmm0fk5wwplhirl5gmw76v0b983irmrg96c" + "commit": "e13222b70dcce09400c98e028bb9159148c1a6b4", + "sha256": "04im0qkb1nx9vygqi5g7w995fc486dpm986pg5s5cbi5l0a3irkl" } }, { @@ -60696,26 +60765,26 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20241018, - 1153 + 20250103, + 449 ], "deps": [ "cl-lib" ], - "commit": "f7c0b6a71a7dcc97a4ba15295373c3d627ab9a6c", - "sha256": "0sl1fzkf29qb7m9m523rzrv5w90f2vhyhw71n7ir844jwlwmhpga" + "commit": "b1a3066f089cebda7932f8b2cd41fd6d8a68d364", + "sha256": "1vq2nw00s0fv739himswkgpci0b4mv77jkh8gp71mxahy3kvmvkz" }, "stable": { "version": [ 1, 5, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "fc61c312be7cd23c654a02f1f81355d562cd627e", - "sha256": "111l502krbrpzm63kbiblchiav8wv38z11snvcx428xjzpl28q1l" + "commit": "057516c33dc8f56b54e236944c5d1816207bee60", + "sha256": "0kab1k9b25cmvvy7rim3wmsrikfr4fa9gwi20dry52x6nndki9vg" } }, { @@ -60895,11 +60964,11 @@ "repo": "emacs-vs/htmltagwrap", "unstable": { "version": [ - 20240120, - 1010 + 20250101, + 907 ], - "commit": "96f89ec74e39903d8ed1f87f261032778c19694a", - "sha256": "1nc58w73q8l2g1g8f6vpbaxfjyw4vbkd96hzd5lm7fb7mbwl6h3k" + "commit": "66dd54079110b4b6d91bb81acf8a31649e3cb29f", + "sha256": "16ir33a328qwrmcy2ip9zidad5c5b46rwf3gmnf2rmsqdnxand3g" }, "stable": { "version": [ @@ -61323,11 +61392,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20241126, - 917 + 20250104, + 2227 ], - "commit": "e2749c6348f4783c5175b225e0f964d23c1ccc1f", - "sha256": "1rnf3kdwwhhpzcmlix8795zcrlkzhsy31l73pgmvr2fpd36agrli" + "commit": "14e002c3f1f405d26f69facb3fe9736a3d79e187", + "sha256": "09cbkjxrm7s6kxfq234m6cyy5cvdvg5znj88h5glf8h0jlsysqya" }, "stable": { "version": [ @@ -61512,6 +61581,30 @@ "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g" } }, + { + "ename": "hyprlang-ts-mode", + "commit": "ed83fb17a56bc5b8d9ab167bf121a7f955a1751c", + "sha256": "171y6k5nx4l8gfvyjpb6pa1c9rdiby8cm37sj2dfl0jg0qminm9i", + "fetcher": "github", + "repo": "Nathan-Melaku/hyprlang-ts-mode", + "unstable": { + "version": [ + 20241225, + 914 + ], + "commit": "458636c6a4505ea1eb16321be124ced234469e3f", + "sha256": "1dkjhnprkk15532vkjhhk4nh6cw05r92hfw1a2wqa6hm5421mcad" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "458636c6a4505ea1eb16321be124ced234469e3f", + "sha256": "1dkjhnprkk15532vkjhhk4nh6cw05r92hfw1a2wqa6hm5421mcad" + } + }, { "ename": "i-ching", "commit": "28b05f2e04d286f3115e33e9d3e717caef8a0a46", @@ -62751,11 +62844,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20241003, - 1252 + 20250102, + 1113 ], - "commit": "833777daf76761997687149af688cda51c0c45f5", - "sha256": "0dlrc3pbbn33gkzj7i8rcwkxf22lw49nhajg5cyg58375h3d8039" + "commit": "d0fe4aca029e251d00102107c3747b41376c32c6", + "sha256": "1ywfy009ir90iiza9nig2p241zmypbzf488m20lxrabcxx7qnzq4" } }, { @@ -62917,20 +63010,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20240908, - 821 + 20241230, + 756 ], - "commit": "f1c1c3c49f114dcb93b4068c034641eeaa2a23af", - "sha256": "130psdjylb36b4kjkdfp47w78ypv2n890rpn8wdggsmwcjgj18s2" + "commit": "de29da5f47e4508c31439d4c29ea57d0659c19df", + "sha256": "1vmscxm26g8fy05b0rrhqwdqyjcqdfbilz5mflaiwrlag55r9ir6" }, "stable": { "version": [ 0, 9, - 2 + 3 ], - "commit": "f1c1c3c49f114dcb93b4068c034641eeaa2a23af", - "sha256": "130psdjylb36b4kjkdfp47w78ypv2n890rpn8wdggsmwcjgj18s2" + "commit": "de29da5f47e4508c31439d4c29ea57d0659c19df", + "sha256": "1vmscxm26g8fy05b0rrhqwdqyjcqdfbilz5mflaiwrlag55r9ir6" } }, { @@ -63027,14 +63120,14 @@ "repo": "jcs-elpa/impatient-showdown", "unstable": { "version": [ - 20240617, - 1944 + 20250101, + 1009 ], "deps": [ "impatient-mode" ], - "commit": "6bdb55c33e99f97a26aab617b686daa6f193eafa", - "sha256": "00fh12ryrfvihckrvd9gh1cfxbj8gix0jagw816yzlj6i7530ldl" + "commit": "5fa168ec9b74ba1579918eed01fde162d11e209a", + "sha256": "1z59h30mdv6ximzw29k18n758y1w15w62i9kdy8p66b002s4cx6w" }, "stable": { "version": [ @@ -63194,11 +63287,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20240925, - 2347 + 20250101, + 1009 ], - "commit": "3c3ff2b10289cf6affc0d922908789deade3cbd2", - "sha256": "0s62551gr3rjw64r2plxk2x335dlzxb9gfk7011nphjlgvxbyb95" + "commit": "6b55986999f230760389a4dcd5d784121305de24", + "sha256": "0q3yzsbjjxc6wxbp240l2nyk5vz72s3jihb1va4h0g2ccw4fxk7j" }, "stable": { "version": [ @@ -63503,11 +63596,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240925, - 49 + 20241220, + 251 ], - "commit": "6399a3668224aa48423c54e81383f73e5e39439a", - "sha256": "0x56z9gcw9yxblf7aqgcdfyahdfm4ilf47j0zmsywva1g0bcllrd" + "commit": "dad78a13f162200a0f6720fe40e0726525424bba", + "sha256": "16bgk4hxnisiv18cnkyjym36yijmig9jln9bglnbvqbvhp2f86b5" }, "stable": { "version": [ @@ -63773,11 +63866,11 @@ "repo": "jamescherti/inhibit-mouse.el", "unstable": { "version": [ - 20241114, - 1902 + 20241203, + 153 ], - "commit": "ce8180dd631d4aadd8b3c434ecbb77c2f5e31012", - "sha256": "0nmwx9nckq4gn3nxsf3gpqmk5cyvgy8lhr89gzvl12070npy8r4z" + "commit": "436cc1b764873771955ee239c63f5db37f7acc22", + "sha256": "0j4xjxs74liz01cs5gqnl2bh50y161zj8q8c74c43wy8qy96p2gm" }, "stable": { "version": [ @@ -63812,20 +63905,20 @@ "repo": "Lindydancer/ini-mode", "unstable": { "version": [ - 20230211, - 1512 + 20250103, + 1901 ], - "commit": "5472abc94e564edc6b469c48d2324519a044a77c", - "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" + "commit": "d99a27548a650b8ad531634419ae55f7b4dbe2fa", + "sha256": "0lgd7ynbw6yvd2ihfiahnd5fkrbsdykk12pggfcbyqz4gn6kxn88" }, "stable": { "version": [ 0, 0, - 7 + 8 ], - "commit": "5472abc94e564edc6b469c48d2324519a044a77c", - "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" + "commit": "d99a27548a650b8ad531634419ae55f7b4dbe2fa", + "sha256": "0lgd7ynbw6yvd2ihfiahnd5fkrbsdykk12pggfcbyqz4gn6kxn88" } }, { @@ -64443,11 +64536,11 @@ "repo": "BriansEmacs/insert-pair-edit.el", "unstable": { "version": [ - 20241018, - 749 + 20241229, + 54 ], - "commit": "757a9c3bd7b2d1f803e7e83af1a07c1656f3ba1a", - "sha256": "006k6mll9p86c6iv34rlvqly4rx7r7mq7xbss9p82hms45za6jyl" + "commit": "5701e598a0d115a4f0261c82320d180e6be3045e", + "sha256": "0z36s751fsh2a84573754s004x6i65xh29dy5parr9xqsj55x7xx" } }, { @@ -64687,14 +64780,14 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20240101, - 940 + 20250101, + 1008 ], "deps": [ "f" ], - "commit": "07f26dee4636b8e17179dcf57622d40f8d6fee38", - "sha256": "0bbqcn37nngw6dz5k0x9s1h281mp5sdb5c9fd0jalj7v1clxvjy6" + "commit": "abd8ee560d1843f9ea01e1a823ddeafe9fbb0b21", + "sha256": "07jwn8f8dpcfbh88s7i942ppk6dwkwd3s2zp4qmyqvzlm7zm2m14" }, "stable": { "version": [ @@ -64747,11 +64840,11 @@ "repo": "chmouel/isgd.el", "unstable": { "version": [ - 20150414, - 936 + 20241230, + 1331 ], - "commit": "764306dadd5a9213799081a48aba22f7c75cca9a", - "sha256": "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach" + "commit": "2dd030ab451cb9e704d173ee1b2388d92362db3b", + "sha256": "0wn6nx94pl7nc94bygm4vi1apzp2qlhfc3m2cg7myj9d2n5aa4xd" }, "stable": { "version": [ @@ -64794,13 +64887,13 @@ "repo": "WammKD/emacs-iso-639", "unstable": { "version": [ - 20240218, - 1008 + 20241209, + 539 ], "deps": [ "levenshtein" ], - "commit": "c217a36102a566bbaf6f0aec81511fc5a9cfc247", + "commit": "e1bfde31c0af34f2fcaed8ca6726e17f2401edf1", "sha256": "0hhxp36k1nlvz6bd8g2y0xj0m5sb7zz3yq8pr5dqql6fh78rq2hm" }, "stable": { @@ -64812,7 +64905,7 @@ "deps": [ "levenshtein" ], - "commit": "c217a36102a566bbaf6f0aec81511fc5a9cfc247", + "commit": "e1bfde31c0af34f2fcaed8ca6726e17f2401edf1", "sha256": "0hhxp36k1nlvz6bd8g2y0xj0m5sb7zz3yq8pr5dqql6fh78rq2hm" } }, @@ -64902,11 +64995,11 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20221104, - 1938 + 20250104, + 2139 ], - "commit": "5ea6ba6effc4b71e7a4aed16b3f42408f9064c01", - "sha256": "0vb6xrv6dnw7x8a2iak8509zz63ss4jkxwg8mbwqgamxcvf39hc8" + "commit": "b4657712a6680886c963025f48798a5f1620d236", + "sha256": "0y4azqxpl9pnlxxwmkryasvlzfsmg8scvb9bzig0v2sqvlp1h136" }, "stable": { "version": [ @@ -65647,8 +65740,8 @@ }, { "ename": "ivy-rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "15alnihcsjhl0kkw2vvyxsjsryhpz1wdi8jjh4sgw1mx6nxl8rik", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -66718,25 +66811,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20241201, - 1341 + 20250101, + 920 ], "deps": [ "compat" ], - "commit": "1be1a91c14031b0cf152c87f2cd5341559b2a1ec", - "sha256": "0a1frjjdkbhxjsn97bsjmil8winycwdvd4qwabgrzk8c5flnjiaa" + "commit": "8407ed958001f6a4718f225737665e50e6666dbf", + "sha256": "16830ax1ijy451ikahg1vxadbmjm414jqg2wpkkj36qz0ia6jq4j" }, "stable": { "version": [ 1, - 10 + 11 ], "deps": [ "compat" ], - "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb", - "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm" + "commit": "e603f9b735c342cd6c6de714366cfef77c8b779c", + "sha256": "12fnqdxvp8gf2vk37m2v4lfy86m8jjnwl4pw7hsxiamhhvp78y33" } }, { @@ -67102,11 +67195,11 @@ "repo": "redguardtoo/js-comint", "unstable": { "version": [ - 20241112, - 609 + 20241205, + 2321 ], - "commit": "a2e6f01b999e26047808c1720b7be0805afc7cb6", - "sha256": "0ap744yp8m1wfws61k8xi53wj3dk4pg25wfzfafs1y6n2jx9r145" + "commit": "68908b5d232738bdc25c4cae502067ef2255a2fd", + "sha256": "1lcj8bp16vp7sp6phx5hhg8k6q2ilrbcrhlfzgszsvz3g2jinlzs" }, "stable": { "version": [ @@ -67171,6 +67264,21 @@ "sha256": "1nlcfqy4wciai7g9zdjy4lx50dipv6yq74fladgsw7yq98hpg501" } }, + { + "ename": "js-pkg-mode", + "commit": "7d2d93b6934f62046c1d4f21dc12f372d5891140", + "sha256": "1fmxwfkx6lirk4ng5z1qszjsv4nv9gwb3ydb9r1wqf8g13k499ks", + "fetcher": "github", + "repo": "ovistoica/js-pkg-mode", + "unstable": { + "version": [ + 20241211, + 744 + ], + "commit": "d2a609a6cfa0a00d6a96e53e124542e464ccc192", + "sha256": "0rminl6an89dy805vhbmnbwdy6afr1cdsgwkss84spamdja9h924" + } + }, { "ename": "js-react-redux-yasnippets", "commit": "b5eef6590b2070ab46a5ab216cdcc6ab82174e47", @@ -67257,14 +67365,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20240908, - 1236 + 20241205, + 140 ], "deps": [ "cl-lib" ], - "commit": "62d6cb169ed4cb6d7ae3ddbd8da9c995fed0ab32", - "sha256": "0yqj4dm9ky8sx0w1hwl0qskliswyqnmzr6p8lzhm3fviyn6q54x5" + "commit": "e0c302872de4d26a9c1614fac8d6b94112b96307", + "sha256": "1midf8yib70k6kh50a2r7g9xri2jvvglz4rchjw89wl2zqyl1p91" }, "stable": { "version": [ @@ -67395,15 +67503,28 @@ "repo": "isamert/jsdoc.el", "unstable": { "version": [ - 20240917, - 1118 + 20241227, + 1219 ], "deps": [ "dash", "s" ], - "commit": "36af204bc1e2582a7a2178249fa88f7995280192", - "sha256": "0cg74637xxlr8vz4h6sxc5v7f7p673g979bnnc5a5mlm63ahr8kh" + "commit": "623994bb50d845de487c100f5cd393ce1d792460", + "sha256": "1aza1p747i6bz2xg2vz63isbnh8agkdffsd7mdxb9xdfnn9cik6f" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "s" + ], + "commit": "5b514ad23834b7a584b184125ba4a66bc3c26cff", + "sha256": "0j99rax3n905ya0ya42093pl8q7kcb8xx2qz6b918f7d8q0mr44n" } }, { @@ -67772,11 +67893,11 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240715, - 2002 + 20250102, + 812 ], - "commit": "e81259a7584619ce3266a2d532f674ef45ee4274", - "sha256": "0z8z41hy4ssyyb4skzzysayw72jc441bffhbw1mgmgpjr7412b94" + "commit": "8043e8339debd66d6d3591c82d8bc8437a1021bd", + "sha256": "0n2l1hs8grb7m7mg3vr06r2jibxaaxriv0lkfpzh09x5m8hh6q8r" }, "stable": { "version": [ @@ -67814,11 +67935,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20241120, - 857 + 20241213, + 1620 ], - "commit": "709c43410fb5da068d7d582cf3f545f7a7a68133", - "sha256": "0dmh3cd5mbsxz6fahvq2apzij53zdv2pvlxhqb3ix7ayb8l67a62" + "commit": "0f4d74f9049df28e2f522733141bfc5b7a0f69a3", + "sha256": "0vyr48afhlm207hidmahp1rsnjdfxdf2li8bisswjd6l3hhd8wxv" }, "stable": { "version": [ @@ -67837,14 +67958,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20241120, - 1523 + 20241213, + 1619 ], "deps": [ "s" ], - "commit": "1f4f6b4e01ff1529b0d7917fbd9ce29451a66510", - "sha256": "0pp7sixpn0hh3743llxjz9rigq4ifsn249kvb4ph1fl0ys6ckj43" + "commit": "317d56021889a336b4be241604ba71e46dc80581", + "sha256": "1xmpplqvwqzqb5r3kjs078kh7bqaj3vzv1q797smhsn8mxraa6y0" }, "stable": { "version": [ @@ -67885,8 +68006,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240812, - 840 + 20241216, + 2010 ], "deps": [ "dash", @@ -67895,8 +68016,8 @@ "s", "spinner" ], - "commit": "dff92c4250e40a6cc106f0ea993f9631ad55eb7c", - "sha256": "1s2382n7bf741hnyxafx4f323f66xbfnpp3nky629s4sy8r4x0hr" + "commit": "e2b08f37b89a39e90e9e7e4f22faa0540a9efb2e", + "sha256": "0v7kx6drjzsrbzsc9qnfbq6w6hp0aqyxmrrvxxb1zn5lfka5z61d" }, "stable": { "version": [ @@ -68106,8 +68227,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20241120, - 230 + 20241203, + 1917 ], "deps": [ "cl-lib", @@ -68116,8 +68237,8 @@ "websocket", "zmq" ], - "commit": "577371744b36aa0afa117b7ded21d08f60331ff6", - "sha256": "1d2945irdi5s2cm2kzx87k28w2gcg1z8f5zm889rm5fv6dj6x1zj" + "commit": "db8a9e233a010a61063f34220821ec76157a2d84", + "sha256": "0gjxi84d95sx5fw8q2a8szfhq6kb4xzwq0xr9a3pirkiga9hxymz" }, "stable": { "version": [ @@ -68182,8 +68303,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20241123, - 1442 + 20241212, + 255 ], "deps": [ "f", @@ -68191,8 +68312,8 @@ "s", "transient" ], - "commit": "16b6ed54ceae839da032e5850075cab43c46be08", - "sha256": "0k2m89y9j8i60iwj5pqphf8n9cqkzx7fz6q4if3rddbxp17n72l4" + "commit": "1c3d0550cd4f53139ce9a63b9954685162e838f7", + "sha256": "04gk6908qb435af9d0f5fl0b9ynh9vwymgcw77ya645p04m74zs0" }, "stable": { "version": [ @@ -68551,11 +68672,11 @@ "repo": "Fabiokleis/kanagawa-emacs", "unstable": { "version": [ - 20241028, - 1204 + 20250101, + 420 ], - "commit": "6fe28070d7b3581415faa3e61af786b596ef3bb0", - "sha256": "1akcgvl29lv01cvsrc0lrgkas680dq45lvhfq63prwmgbinb2x6y" + "commit": "1d34a95c0f639b035481b5506089bc209769bab6", + "sha256": "1gqj62hw442021bjbx7bfqlbk38gvczjd3cfgwycnydia6pgnjxy" } }, { @@ -68630,15 +68751,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20241104, - 1 + 20250104, + 708 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "343ad8cd73c7509af2ea7af5eb856ece97dee7a3", - "sha256": "0s4pnb8wblnj0kpqd35b6z7b719p7rfs0n2qcs6l8wyd8f3xdzwa" + "commit": "fc43da84f4f786f30ee7f34fa4ceda64f2246074", + "sha256": "0akvlrsj2x7112vjd61zx3vii5ni4wm02wi8c6dav4yy1xq2y128" }, "stable": { "version": [ @@ -69271,11 +69392,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20240101, - 846 + 20250101, + 849 ], - "commit": "b4fdde53ec884c931db8465b334af6057b30daa1", - "sha256": "1q39dwzs9hx9ay57j1vqqqaw2fj9xzshldzniaw8rqpakqa751q3" + "commit": "5b3501dc95755d85fcf21b00ae0d347446efe73b", + "sha256": "0qbabikk1ingkqgbwb4wk9m7zxhn2g1kgs0i0b6mccmn4134sizk" }, "stable": { "version": [ @@ -69382,28 +69503,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20241129, - 343 + 20241229, + 1839 ], "deps": [ "dash", "transient" ], - "commit": "439b18c21f0d540fc6c6a9aea0c9b22e4259e6e0", - "sha256": "09bzvm603kzh3md5plcc01jwwj3mmb87z7c3p9wz0k662hg7nwdk" + "commit": "8f69eb949bb0ab79e2c74aa18e77f82420e9fbe6", + "sha256": "1ymz2p9yanblpg3v7l9l990s8dgwayjcicgkh8x6dvsrq2afqvfq" }, "stable": { "version": [ 1, - 30, - 10 + 33, + 0 ], "deps": [ "dash", "transient" ], - "commit": "439b18c21f0d540fc6c6a9aea0c9b22e4259e6e0", - "sha256": "09bzvm603kzh3md5plcc01jwwj3mmb87z7c3p9wz0k662hg7nwdk" + "commit": "8f69eb949bb0ab79e2c74aa18e77f82420e9fbe6", + "sha256": "1ymz2p9yanblpg3v7l9l990s8dgwayjcicgkh8x6dvsrq2afqvfq" } }, { @@ -69436,6 +69557,30 @@ "sha256": "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv" } }, + { + "ename": "kill-dollar-mode", + "commit": "ea444357715c05c2bad942928937d9dc80a8b977", + "sha256": "0f4r9277yzgjl51nwkaddqi6j3vnz2w59q8p1a97v1pw4sph9m34", + "fetcher": "github", + "repo": "sandinmyjoints/kill-dollar-mode", + "unstable": { + "version": [ + 20241217, + 1947 + ], + "commit": "e51c076f93605c5a651b549731ccfc85a2564aca", + "sha256": "1fawyggzmabljs8d5aq39kdq54ifqyyx3sfwpx8x4fzayrzl7g8s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "96c1fe1b40950a2666a39bd53ff9e5faa9d46ef1", + "sha256": "1p81dh34s84kyk0d3mn0chyyi2va44vpx6in4cykh6pdf4qk04g0" + } + }, { "ename": "kill-file-path", "commit": "bbb76c99758c378c1cf26046a4e25e0933dfd947", @@ -69571,20 +69716,20 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20240105, - 940 + 20210318, + 2106 ], - "commit": "9ef218027178115a66b417ae34b21f488bdd3617", - "sha256": "17h5nk4h013ja3hm8xn5ljwsnh56qcmwskjg934ky4p9z393v7j0" + "commit": "db86b06b9b72e514c122e3f54a0bce74adad44c5", + "sha256": "1v14gsk1fal8xqpy8myk02n7s0f0yzpcmgf8a0mizh858y1sbxxv" }, "stable": { "version": [ 2, 3, - 0 + 1 ], - "commit": "9ef218027178115a66b417ae34b21f488bdd3617", - "sha256": "17h5nk4h013ja3hm8xn5ljwsnh56qcmwskjg934ky4p9z393v7j0" + "commit": "20d74dcd30f143abbd1aa94c76bafc5bd934d5bd", + "sha256": "1i3ka71h3ggli7bajjf0x7knh6qcjv53cqd06236skalz8bnih5b" } }, { @@ -69661,11 +69806,11 @@ "repo": "WammKD/Emacs-Klondike", "unstable": { "version": [ - 20240131, - 453 + 20241215, + 151 ], - "commit": "1cf14d7b6c14ebde741c36f6aa871dcd41e37cff", - "sha256": "0vgf03zqbd6nfxrz90x0favm6d15gba86hp8vg6wcbckc7j2gn1g" + "commit": "d5b151ee47f8ad3d57b3bc221389383b1c1cfec3", + "sha256": "1hrl2k4092jng8yra53han1cgblpfddvn2j20jqrkv2idv0xrcfl" }, "stable": { "version": [ @@ -69673,8 +69818,8 @@ 2, 0 ], - "commit": "99f7aad1221a76402746a06b57e89622fd9cf33a", - "sha256": "07xcc5gryzabxk7czghkwq1v8r09mg9yh8rwy1v2gs8qm9lwypgv" + "commit": "4e5d3a15bc66b790bf9c1c759f5ba7394e552112", + "sha256": "0bpzvs6j4zi47kdh5xc0wq3084mpzcfl3w74yz7g1nqkxbj9d4b3" } }, { @@ -69839,11 +69984,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20240917, - 1401 + 20241226, + 1643 ], - "commit": "bf1646a386408103e6267599a26e5f5479fa4635", - "sha256": "1di16q5cgjkmql5h6ah8bndh58a73rlk9gxkqmdvxh8j3lschryn" + "commit": "a25d56cecac9160ba7c140f982ec16ca7b2fe97f", + "sha256": "0d1y8inz0ljd85s8ndlg1lk5whqm7y68kfdh2klhf0qc42phrr6z" } }, { @@ -70235,15 +70380,15 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20230331, - 1806 + 20241212, + 1314 ], "deps": [ "aas", "auctex" ], - "commit": "a00f0aba237b85b3e5fd60cf84de5759d1bf5d48", - "sha256": "0mjq9lkd6r8mlmji0a1i9rjn1xbd6g0swzr3x55k9srla3nm2l0k" + "commit": "f5fb180ab23b7eb0695ade84c9077aa701f47bbf", + "sha256": "1pkm1qkfsps51rbj5vb0xl7vsqndy719kdw7gai5lmb702q47qmp" }, "stable": { "version": [ @@ -70267,12 +70412,11 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20241004, - 818 + 20241229, + 2148 ], "deps": [ "async-await", - "auth-source", "compat", "f", "memoize", @@ -70280,14 +70424,14 @@ "request", "s" ], - "commit": "193eb6b74f4c60c455cae276d3881668383b21fc", - "sha256": "04qihisw1baly5wspkafjqlw7w8k8v7lmjj6hcldc5bpjpc9f06l" + "commit": "7552236f24f704a83ed2c8b8a53f59af312a844e", + "sha256": "1mrwqdf5xkv03458jd82v95a965ha6f4jgp0daxjsj2980nv7nx4" }, "stable": { "version": [ 2, - 0, - 0 + 1, + 1 ], "deps": [ "async-await", @@ -70298,8 +70442,8 @@ "request", "s" ], - "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", - "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" + "commit": "1edebf13309b39a2b0299115e011c751310fa158", + "sha256": "1majirap2aqc9ch9d7rzkb7k2az3a8aaaq60f4q9izpdn5pi3wkd" } }, { @@ -70388,16 +70532,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20241110, - 1640 + 20250102, + 959 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "bd45582bb912bad97f614264ff3142d11a6399a1", - "sha256": "07aiywrdy4r2y5bm8pmf04lpdj4gwngkkyf2bl8h7kj07s8zy9pq" + "commit": "15d4eeaeefd33f44a8e6258dc905dacdb731cacc", + "sha256": "0yng70df2rk57bs9l0h69fim9ivd0whvmwvgygxc1d8rrlmhnx8y" }, "stable": { "version": [ @@ -71065,6 +71209,24 @@ "sha256": "0hhn0gqkwki0dfk6j759hmbj1ijn4bs550jh3kgy9jfmnb7cd81l" } }, + { + "ename": "le-gpt", + "commit": "228594b85d098a800d53acff23d00028c8a4143f", + "sha256": "0kzyn2plr55xzv5g9rsi99qc17r16kvnm4zida7p0aqqgrshh88q", + "fetcher": "github", + "repo": "AnselmC/le-gpt.el", + "unstable": { + "version": [ + 20241218, + 909 + ], + "deps": [ + "markdown-mode" + ], + "commit": "07c7bce41e33eda70c1d2023f6c96fe4428097a8", + "sha256": "15vggpcy1c7gclbkwq72ljf8bnmsldvnxhwvmjwf386948d0hz5c" + } + }, { "ename": "le-thesaurus", "commit": "4534fab1d43c425745f44465adbd1f8a9168ced8", @@ -71073,14 +71235,14 @@ "repo": "AnselmC/le-thesaurus.el", "unstable": { "version": [ - 20230112, - 1604 + 20241229, + 1950 ], "deps": [ "request" ], - "commit": "83e8df8957a3b8167cc2bf97849a1eca555ce9a6", - "sha256": "00phb69hn8w5zl47k5l8gqlxqjm5ig7rz0v4g47hx7xlnhcsfvj4" + "commit": "8c8ea595678da69df817a173ec043ab1b17d96c3", + "sha256": "17qg24xi9gs8pnqwzcmb6fpz1ba2zmsm4p8z7z54jwzsbq60b8w2" } }, { @@ -71432,15 +71594,15 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20241102, - 1553 + 20241228, + 1420 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "79c4b8112be95df0193e7dff99a097ec818b04cb", - "sha256": "0arhjcx9yzf9jgrl6f87lqviaq8sqkn8wfbxzbkk952fgp32v6h6" + "commit": "64ba2554f2742a05f8208434d23e2dcb2c476c41", + "sha256": "15xrs2hygx236driipb1fm2k4ky86ybnv104z178pyvfm6dndnjj" }, "stable": { "version": [ @@ -71621,20 +71783,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20240713, - 929 + 20241224, + 1031 ], - "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572", - "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3" + "commit": "d784771770894bd27659cc9db252ee4578d228b6", + "sha256": "01ipwgg3klbq4pc1vpsg2042hlcgqlfp24rildb9ddqzhnfx6mlm" }, "stable": { "version": [ 1, 2, - 1 + 2 ], - "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572", - "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3" + "commit": "d784771770894bd27659cc9db252ee4578d228b6", + "sha256": "01ipwgg3klbq4pc1vpsg2042hlcgqlfp24rildb9ddqzhnfx6mlm" } }, { @@ -71709,11 +71871,11 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20230102, - 1428 + 20241206, + 1536 ], - "commit": "68c9c7ec8ef441eb79e68772ec4956fd2671b2e7", - "sha256": "1lx3szdlhvidys9vk8d0pznnsni31wjm7afks3hhmdjj6hcp3cxi" + "commit": "7ba1e7538f3efad909e0a1d7b54fbbb970d84596", + "sha256": "18klpw8k6a0waqxl701dwvw5c699ixj1sg276g2qnvfy22a9hgvr" }, "stable": { "version": [ @@ -71954,14 +72116,14 @@ "repo": "jcs-elpa/license-templates", "unstable": { "version": [ - 20240101, - 932 + 20250101, + 1008 ], "deps": [ "request" ], - "commit": "62adc47eb36a6f2eabe63c3e9dc8ce7f94007f19", - "sha256": "1r9z81xivk4d9gjyr01d55l4wrmvwzj2jli63qmq939h6jk2vvnx" + "commit": "93c4374301aa3fdb3dc67e3a7513af02e536d367", + "sha256": "0vyq3qnb4f0ig0dd6pa6s7lzxjvl2rmpk1k3j708fwhf8yvkwzdh" }, "stable": { "version": [ @@ -72032,16 +72194,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20240715, - 2304 + 20250101, + 909 ], "deps": [ "fringe-helper", "ht", "ov" ], - "commit": "76677e48451b77508673a52dcc0845b87e5f81fe", - "sha256": "1zr4fvw286gdibf642hv7jnsyyvw81mxk7695g7wqb7q582lkm3h" + "commit": "bab0c4cbe344ca888842278e982155a3916617d0", + "sha256": "1xqs488zyd94p4hrfjzbaxs3fm45b60rnl0jjc1wgbqaksmqqbg1" }, "stable": { "version": [ @@ -72190,14 +72352,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20240903, - 2150 + 20241219, + 2051 ], "deps": [ "avy" ], - "commit": "bf4ca2126d5c0a06df7ae26f478e94cb03ab932b", - "sha256": "0d3zi7mc4vr60haidb4p4jhfwxwygirpr7kyk8ggpbwh0r2i6k3z" + "commit": "826993a0ab736ab09f53a0623fb44edf2182b07c", + "sha256": "00grv36l98fzz0iabc2li19k9wf9k9dmsg0lq5p7qnjfizshyzrp" } }, { @@ -72782,11 +72944,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20220626, - 932 + 20250103, + 132 ], - "commit": "bbc4befbf13f63b92cb1d780501482ae5bd8285b", - "sha256": "1ip04jva082c4cvdqa2nmc8kfjwwx21ggr6fylpm0pbj2b55vk0k" + "commit": "c559eff46dd7fe0ffc4ad7bf6dd65ee5be516368", + "sha256": "1h8j16hqhncbfa6nf046qfzhplzqql9i2jjwx1kmqnyxfcvv1zs6" }, "stable": { "version": [ @@ -72894,11 +73056,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20241127, - 2323 + 20241214, + 1526 ], - "commit": "b417ad93191e8eecaca347f5407dd4bb4c07b6f8", - "sha256": "101dd0b1czc28yjsdz0fdvkh8b76rd03a1br7sldlmsy3dfhk669" + "commit": "87bfff4da227554162e1148ded42ef848248bacb", + "sha256": "0ikkfwcb58zraabn32zhdjrszgyrlsy5j5nspajzx2lni7nlws67" }, "stable": { "version": [ @@ -73008,20 +73170,20 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20241104, - 2206 + 20250101, + 1412 ], - "commit": "f4e80a582f7ec857783274bee6614560ce49d497", - "sha256": "1km89ks7xg89sjqxiri9lxj58hc17z13z7mzcq3y66yv1dfrrziz" + "commit": "07a47101ab2b0dab47094b369585443b89ac31c9", + "sha256": "1664y6b1djwfhj8iv0hac9y78nqs4hhakvp6f7js3m61hd5rizfp" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "f4e80a582f7ec857783274bee6614560ce49d497", - "sha256": "1km89ks7xg89sjqxiri9lxj58hc17z13z7mzcq3y66yv1dfrrziz" + "commit": "07a47101ab2b0dab47094b369585443b89ac31c9", + "sha256": "1664y6b1djwfhj8iv0hac9y78nqs4hhakvp6f7js3m61hd5rizfp" } }, { @@ -73353,16 +73515,16 @@ "repo": "jcs-elpa/logms", "unstable": { "version": [ - 20240101, - 942 + 20250101, + 1008 ], "deps": [ "f", "ht", "s" ], - "commit": "ef571d7ab8b2809363197e6867bfc1fbff5d14b7", - "sha256": "19cq2sshk7ag76a28q2l039a6d126jiws06mfi1b7kkg1n5fsksm" + "commit": "48d50cdc90b68b86333bcdb3f2ebfa4568db198c", + "sha256": "1a672vh25iy6552clg1gv594jibnsi4krjbbiv56pqj3brp043h1" }, "stable": { "version": [ @@ -73449,27 +73611,30 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20241118, - 1819 + 20241225, + 1410 ], "deps": [ + "compat", "datetime", "extmap" ], - "commit": "de9694cfdc7006017781e7d32bb8bad38c7fda46", - "sha256": "0rl05yy16x0gsc6y58a2zyxc0dbyh5w1c6jx67mkvjxldpqah1sl" + "commit": "034c240c816188bf8be7441c9b0925abb92e861c", + "sha256": "12sh9mrpgff4sm1yr3zc2crpwiq3zrj3md0hd0mr69gdkq07xfw3" }, "stable": { "version": [ 0, - 19 + 19, + 1 ], "deps": [ + "compat", "datetime", "extmap" ], - "commit": "50f0b12f9cb3b8bdc9b28c16187495770ff6dff6", - "sha256": "1z9w1rdr1d7j6fw9rb05wjrpdj9zka683xj35cxws7qplk3dlz29" + "commit": "9ce423a9fc319bb919c681e16939b9f561f7a942", + "sha256": "0qgkmjw5prc5zrsccdmh9wfr1fyk9jfdfnqn6ldsbi7jhbr71366" } }, { @@ -73605,8 +73770,8 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20241129, - 1652 + 20250104, + 2303 ], "deps": [ "compat", @@ -73614,8 +73779,8 @@ "seq", "stream" ], - "commit": "159cf1811c2d27552166c9976f8612c487054d31", - "sha256": "1dzrh3wiqc8yb6kcrbb38pngygspm9zjm2wrhs041albkj7sz1cx" + "commit": "95f7d12f0175519d86c40ecd8c5159dd7b99e540", + "sha256": "0j23c1k48dswa183vsw7vj95j0fp34dscjpnlynlas5ycrp8df2q" }, "stable": { "version": [ @@ -73635,21 +73800,21 @@ }, { "ename": "loopy-dash", - "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", - "sha256": "0hk4c415wp4dqx1xjs246p8hqn15iamj8xiig2cla1f24zd7kd28", + "commit": "b51bc89476900ff52cfeeee5943ddee561bcb5dc", + "sha256": "0gqy6z8b7iyyhbqy33n1b67v839z5711x49w097phvvm5rbwi7i2", "fetcher": "github", - "repo": "okamsn/loopy", + "repo": "okamsn/loopy-dash", "unstable": { "version": [ - 20240818, - 245 + 20241228, + 323 ], "deps": [ "dash", "loopy" ], - "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", - "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" + "commit": "56c8413dbcffef2b1a0896d53584296619cb1504", + "sha256": "0j2aj1z6bh27710c57bkd296zyb12zml4p6jr0dzxrmfssh1w9dd" }, "stable": { "version": [ @@ -73862,8 +74027,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20240229, - 115 + 20250101, + 850 ], "deps": [ "grammarly", @@ -73872,8 +74037,8 @@ "request", "s" ], - "commit": "39deb23b282785eaffc6ae17838c92c613a49315", - "sha256": "0f2kj2d64b9rqz9jf38629b5hwvp7wscbc646ydfmwib5f2m723x" + "commit": "0ae43b9d92c0f324d0ad9f3c28c34a305381f13e", + "sha256": "03kpxas4b6ld9pzpcy331i9gbn8pyhpvqbb3mr1y66j18czr5vnj" }, "stable": { "version": [ @@ -74095,28 +74260,28 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20241006, - 800 + 20250101, + 655 ], "deps": [ "consult", "lsp-mode" ], - "commit": "36a37a8e0a6b0edbea8e67dab89d12980d2a368f", - "sha256": "0yfmqjp1bmp8rp9vl9y5qmic3wr2f5p10gyb2rlmpgfnx5c8575g" + "commit": "ec9a8674781162c8878f6339087cae0679e3a6e3", + "sha256": "0iqy4xfgxfhc17kxrwf1lgz3v8sacazr5m5l0231lf2kbhjb2lnb" }, "stable": { "version": [ 3, - 7, - 1 + 9, + 0 ], "deps": [ "consult", "lsp-mode" ], - "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", - "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" + "commit": "570e61629a3a2a895067f7a5766482717c820004", + "sha256": "0q08bazvkpmgbkq2bxw4kj32mljs2is14gyl27hh1v58x17616p0" } }, { @@ -74127,14 +74292,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20241130, - 801 + 20250101, + 852 ], "deps": [ "lsp-mode" ], - "commit": "8338c47dc2ea99dea4797ad110592139b2c66e59", - "sha256": "011x1daddvdbih3nawr1f4j0frjnmg8q8p0727bi9xm86yffln51" + "commit": "98435127e24719a398c41ebaf14d26928de4632a", + "sha256": "0jwn3869dwjw2nyfmhg6dkaz4fslwmb2k2h54gpiwzwv5a1pg03j" }, "stable": { "version": [ @@ -74159,8 +74324,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20241112, - 1142 + 20250102, + 1828 ], "deps": [ "dap-mode", @@ -74172,8 +74337,8 @@ "scala-mode", "treemacs" ], - "commit": "b5139c959336758a93d0e55458e6ca938d9fd16a", - "sha256": "1axbcmfnz176dfpd5nbx2f1nfad8pzl8ah9gddia4smad23cpvcm" + "commit": "6a6a345a8a6cd8814b40909aef8e99055b128fa0", + "sha256": "0cik7mq8g32h98iyqjmai3k5gi17f71mp3y39a04cp4grbv1jxky" }, "stable": { "version": [ @@ -74203,8 +74368,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20241201, - 2156 + 20250105, + 453 ], "deps": [ "dash", @@ -74215,8 +74380,8 @@ "markdown-mode", "spinner" ], - "commit": "57ea512212b4cdd650b0bc4bcadd14fd678c212d", - "sha256": "0b11lqi7n00xqk9miyazi39nrhf0p110rl7177xy0gbzxjzpcvfm" + "commit": "f3bd38d50b6d4f803c490b64f8c5e69988a0b933", + "sha256": "1r7garg51bcxzv9cpmpxdzislrwp0803bzli9kh1cqnj1l9zj2jq" }, "stable": { "version": [ @@ -74291,35 +74456,6 @@ "sha256": "0z2z0idzpc8mql3mc0szb81j712ad54kpnxj28j6giid1a540bzd" } }, - { - "ename": "lsp-p4", - "commit": "53f0da8b3d2903adeffdbc3d8df7d630bfd9ff71", - "sha256": "0cd3n17lqwz08zfkm9g5cr1cj2asznlbhxrym2a7b7shdmn3yx5f", - "fetcher": "github", - "repo": "dmakarov/p4ls", - "unstable": { - "version": [ - 20190127, - 1049 - ], - "deps": [ - "lsp-mode" - ], - "commit": "084e33a5782f9153502d9b03e63d9cbbe81cdaeb", - "sha256": "0id3rw2p35cs7ax85590qs16zybgrjcapsnly5ifzjk0a5k7548c" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "lsp-mode" - ], - "commit": "9ebc597ba37e6f8fccbc08327cf57ca8ec793ffe", - "sha256": "0dd4n0c1rbqcy7hl6gb9nqjj7hfv4566d6ipdlnxjma0zjs84sjf" - } - }, { "ename": "lsp-pascal", "commit": "41e4088e4b0cd99aafac40c83188112a680a65f7", @@ -74479,14 +74615,14 @@ "repo": "shader-ls/lsp-shader", "unstable": { "version": [ - 20240229, - 111 + 20250101, + 926 ], "deps": [ "lsp-mode" ], - "commit": "02fdc6d74e931db52ba1aa8dcce17d0a26049242", - "sha256": "1ky5rds4mvfnpibp4n9zmlczlccncwjhz4ylrzs39d2rlfw953qn" + "commit": "802e1a3414f90c5ab37a18716198936cc39e4994", + "sha256": "0z4j9f1j5qjpyy03n68cs8z5lbdvci3jagmp0l1bbs9rm4zw4fgy" }, "stable": { "version": [ @@ -74628,16 +74764,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20240514, - 1943 + 20241204, + 1808 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "00f1fecdfb41c30428734cf27e492f26f46627fb", - "sha256": "1zpmszary67g9wvkjrm1i7ilcmmdbbzp7liq47xii4k78y9dj55l" + "commit": "f0edfac7b3736fcab617cbeb07e465c9153ae68b", + "sha256": "0i84623jnzp8bdi6bw5r90rcjgfn651qrahvb8qaah5xzrs31kh1" }, "stable": { "version": [ @@ -74696,10 +74832,10 @@ }, { "ename": "lurk-mode", - "commit": "8399712211a0fb927970917aec906a97488d00fb", - "sha256": "09djfy6d0929csx6f32klm4p41rc6gvr01g60wjiyg7yycw1r4fr", + "commit": "f315c69ce5ec82f7daa5e83869cc1440e475e443", + "sha256": "02z5jr7q1kikx5vhznvrfpa8if8i87whqrg92w68n52yhf67m4ff", "fetcher": "github", - "repo": "argumentcomputer/lurk-emacs", + "repo": "lurk-lab/lurk-emacs", "unstable": { "version": [ 20230120, @@ -74876,16 +75012,16 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20231225, - 2350 + 20241222, + 1620 ], "deps": [ "emms", "f", "request" ], - "commit": "bcde34a7ae8db84170bfe76260eefed64686ddf0", - "sha256": "1ldim9sj9i8mdvsbwv2zs095zbr71z4rksjk8288rkbddhsg72xy" + "commit": "2686f97830d6ba03e86992e44405fad9ae58981f", + "sha256": "0nqgcl0hish831a0h3miffj5m6m3jv70h6a2pvyj1k6bqq22nxva" }, "stable": { "version": [ @@ -74910,14 +75046,14 @@ "repo": "phillord/m-buffer-el", "unstable": { "version": [ - 20240302, - 2255 + 20241215, + 2214 ], "deps": [ "seq" ], - "commit": "8a51de3366599e7fa52e37b596c9ce226b6f04c5", - "sha256": "1v632j4c2k8ram18ayaq64rf01y102a40rh9mvrzzvmf2jkmcw6p" + "commit": "5e7714835b2289f61dad24c0b5cf98d28fc313b0", + "sha256": "16h8nj01h0ahcw4zk9nb8mm8972nl8qw75vj0gvpjlg1zk5kvl45" }, "stable": { "version": [ @@ -74987,14 +75123,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20241130, - 1219 + 20241209, + 2213 ], "deps": [ "transient" ], - "commit": "ff24e67cf1e5b3b009f82812049b0406aa3a9fab", - "sha256": "1rps0q2djyvxlvs926x15rkfc7iycdk7z54jfbn6si75dvs8qck8" + "commit": "3afc12be5f8e544f6ab7a1fdf31a8e69d154b299", + "sha256": "102x70q5k0dn4kxbvfy242jm4qdni8965g9mcc2y3qx1dkwa7cbf" } }, { @@ -75028,15 +75164,15 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20241025, - 1456 + 20241224, + 1752 ], "deps": [ "cl-lib", "compat" ], - "commit": "419873665f3d0b3d5779aa119b58a3daa96e3326", - "sha256": "0271j0f9cb0nwbip2qc9pqr27si3vaalyv6l6w9n39pcmxdxvy8n" + "commit": "02967fef0bcf114ab6439fdfb06e4af571d68799", + "sha256": "1c4lvipi1bjn56m4m69aq7x7agqzal3x04wwvnmibpgpbjkm8wnn" }, "stable": { "version": [ @@ -75190,8 +75326,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20241130, - 1707 + 20250104, + 2022 ], "deps": [ "compat", @@ -75201,14 +75337,14 @@ "transient", "with-editor" ], - "commit": "e8b85e43d491ca0c0a3fc41ee5d8c4aa34649cd3", - "sha256": "0zf8455gix847f8qf24a427mh0bi8bdjmha01fgd09dh4yxjrn4h" + "commit": "92f6d57a0a1378555b3e93976ed6ffd77696b990", + "sha256": "1k6pky6a54sp4229rb9cdm1dcb7q001bvbbxiq7r9pyw3wnzs8vg" }, "stable": { "version": [ 4, - 1, - 2 + 2, + 0 ], "deps": [ "compat", @@ -75218,8 +75354,8 @@ "transient", "with-editor" ], - "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf", - "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72" + "commit": "7dfebba55bf687a25049882c2316166d968048ea", + "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" } }, { @@ -75779,30 +75915,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20241122, - 1431 + 20250101, + 1803 ], "deps": [ "compat", "dash", "seq" ], - "commit": "93a7752842b2d4feff6b5deba44411e9c4249dfe", - "sha256": "152i6p9snjpni3ywlfcvj6z6fxr8aa60bjfxvz8i4ddgkp7ymr6n" + "commit": "7dfebba55bf687a25049882c2316166d968048ea", + "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" }, "stable": { "version": [ 4, - 1, - 2 + 2, + 0 ], "deps": [ "compat", "dash", "seq" ], - "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf", - "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72" + "commit": "7dfebba55bf687a25049882c2316166d968048ea", + "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" } }, { @@ -76006,44 +76142,6 @@ "sha256": "0mq437z9ng2i2amkv26bw9ak7ddw40h2q4wmpf517bv2s7qxfgi1" } }, - { - "ename": "magithub", - "commit": "e555b46f5de7591aa8e10a7cf67421e26a676db8", - "sha256": "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab", - "fetcher": "github", - "repo": "vermiculus/magithub", - "unstable": { - "version": [ - 20220315, - 117 - ], - "deps": [ - "ghub+", - "git-commit", - "magit", - "markdown-mode", - "s" - ], - "commit": "dd62c7057155c0a334e6d9087779a2923d2300b8", - "sha256": "1v8nsv1y4fa3y2skx1w3gbf438zlf00zlmsxkh692kmvbkx4sdf4" - }, - "stable": { - "version": [ - 0, - 1, - 7 - ], - "deps": [ - "ghub+", - "git-commit", - "magit", - "markdown-mode", - "s" - ], - "commit": "81e75cbbbac820a3297e6b6a1e5dc6d9cfe091d0", - "sha256": "1iq8c939c0a6v8gq31vcjw6nxwnz4fpavcd6xf4h2rb6rkmxmhvl" - } - }, { "ename": "magma-mode", "commit": "0a82892371eb390d8a802919458c6c2baacd1597", @@ -76426,14 +76524,14 @@ "repo": "jcs-elpa/manage-minor-mode-table", "unstable": { "version": [ - 20240101, - 931 + 20250101, + 1012 ], "deps": [ "manage-minor-mode" ], - "commit": "ed492f13f71f7897b50da9acd49a7540b0f81a3f", - "sha256": "1bjvxj9wrvxpcgqsivfivgxqpxx4y9n39gvck1ffj0vfrvc6ghj2" + "commit": "5fee7081b0ed78774448fc923cced0384a83d48c", + "sha256": "0wq739br7nqc15yvwajwag9fvbgj1wzs5mqr868canx8nz2s6vn1" }, "stable": { "version": [ @@ -76456,11 +76554,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20231203, - 334 + 20250103, + 814 ], - "commit": "a410c2b66f514bdeb546b7fe8e2d9fee675096ac", - "sha256": "0j164b2dg7m815anvli1y5k7zgf5k6qm8gssr4bjp8xrpxbcn989" + "commit": "f6475ef40fa9b78de6530610e83cb36ff8ed5d1a", + "sha256": "0fjra40wc4b2ai4jd6zg5jsnpyfyfdyj74i3gz2asnqy99c2ryil" } }, { @@ -76609,25 +76707,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20241124, - 1138 + 20250101, + 920 ], "deps": [ "compat" ], - "commit": "643a5f50c9f9d0698c8b1d72678886aefcf69052", - "sha256": "0lh7hgqkm4vhnnizarjw5zlxdpmjcmjrvmazzirk9rb7i72b56ia" + "commit": "c390456b89ad46bc10c3ef2ee5df59947b72084e", + "sha256": "0y1bffnb3lhb273qgmgcnq2g87cavn5qa1f8r3bdkqvvdzrga6ym" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "compat" ], - "commit": "7a7f3363d042d1bf43ae697f4401638ed18230a5", - "sha256": "1y79fhki7wbfaw24n5n5w80yvchj1ncz74yvfbgf7sna2ngz4yih" + "commit": "006a7cd0a14dd651dcff65ed96c0d52d2067b8c1", + "sha256": "12kg0zd1zw2rc3pxi655gh37bxbbkpmdb05yi77rdccl8gh9jwry" } }, { @@ -76859,16 +76957,16 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20241129, - 1248 + 20241226, + 1737 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "ba74a85ec94a638054ee65cbc8d95581946d018b", - "sha256": "0rm8hx0a2ppp0z4jl5c6kyhlwkrla6xvr2nkw7bl7wk46i9hh2g5" + "commit": "d2fb4cbd95e558042307d706f9f47f93687c9fcc", + "sha256": "13xzcmrhaf0zjbb4ngzqvvwm43h1z9md34n79kl2wrdhmgh7ifd7" }, "stable": { "version": [ @@ -77012,11 +77110,11 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20240101, - 930 + 20250101, + 1012 ], - "commit": "cb5c17be49fcf96614364eb12079351bf4d749a4", - "sha256": "1mcxfzfmlhzj1r77l82d4q9baidcmkb087rmf1ia1f2vz0xjmz5n" + "commit": "5f40543099ffe55b64dbcc57308dff7efe948bbe", + "sha256": "11a20jy5zg7yp853grd3xjwvs6xb6sqbdq96hizvghj48jra5rl9" }, "stable": { "version": [ @@ -77096,30 +77194,30 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20241121, - 1724 + 20241223, + 1040 ], "deps": [ "persist", "request", "tp" ], - "commit": "cf6416313084a04e5028f46274e88284e2d120ee", - "sha256": "0pc5xjkzxhjwmcbmn9zsqw9z2yyh4vp4qbihk14qyzhz00ni113h" + "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", + "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" }, "stable": { "version": [ 1, 1, - 6 + 8 ], "deps": [ "persist", "request", "tp" ], - "commit": "cf6416313084a04e5028f46274e88284e2d120ee", - "sha256": "0pc5xjkzxhjwmcbmn9zsqw9z2yyh4vp4qbihk14qyzhz00ni113h" + "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", + "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" } }, { @@ -77257,8 +77355,16 @@ "repo": "mathworks/Emacs-MATLAB-Mode", "unstable": { "version": [ - 20241117, - 1628 + 20241208, + 1657 + ], + "commit": "935137844e16551a5369f928d2591556be7fb9c2", + "sha256": "0gwr1f5mmzgznpvki9nri6lm4lj3qxlv40hsbsjgvmk1921xs6xd" + }, + "stable": { + "version": [ + 6, + 2 ], "commit": "390bca3fd9ac440e6c3dcdc524e77c7590423f08", "sha256": "1dfv6f05v7i7966q39knilqjnz1rif4zg6cdk31sy6h8prc6arc3" @@ -77843,11 +77949,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20241201, - 1935 + 20241224, + 2115 ], - "commit": "2d352b94df1a4e633d7941acdafd7b13363eccef", - "sha256": "05q2ri3b5m3l3c5nkwgb6nkzrb6df0r3ldy8ysa32qqsn9zyaw9x" + "commit": "af3f10e95ebb0754a1afcd4883e8e2e680490c4b", + "sha256": "04ryj47a16hy9psx7xry2l4by74b8j6r1j1grgc2185bmxh2j6jb" }, "stable": { "version": [ @@ -78030,26 +78136,26 @@ "repo": "KeyWeeUsr/mermaid-docker-mode", "unstable": { "version": [ - 20231126, - 1943 + 20241206, + 734 ], "deps": [ "mermaid-mode" ], - "commit": "9d3421e02704f50e2e695d8dbe6fbb7eb5f2371f", - "sha256": "0lxbb2qfkfg9rmf2x9xy08zmfc934rprx809lai83593vakyf9pp" + "commit": "92dd790c099f2d90899622421d76cbcc29e36c10", + "sha256": "0l879kfi72fasd3067l3fh8mw0ir6nhs8mjaiddxgiqgxwlrdr6q" }, "stable": { "version": [ - 1, 2, - 0 + 0, + 2 ], "deps": [ "mermaid-mode" ], - "commit": "9d3421e02704f50e2e695d8dbe6fbb7eb5f2371f", - "sha256": "0lxbb2qfkfg9rmf2x9xy08zmfc934rprx809lai83593vakyf9pp" + "commit": "92dd790c099f2d90899622421d76cbcc29e36c10", + "sha256": "0l879kfi72fasd3067l3fh8mw0ir6nhs8mjaiddxgiqgxwlrdr6q" } }, { @@ -78060,11 +78166,11 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20240821, - 1750 + 20241213, + 1913 ], - "commit": "fc8ae220e8d7769114072493975df821b68df6b3", - "sha256": "0cgcbi6ibwkdhmslab1q0iiiyifgiinah1qv4acg3dm5xwlfpdd8" + "commit": "e74d4da7612c7a88e07f9dd3369e3b9fd36f396c", + "sha256": "0dqg3fyhyxn29b0fw7zr3ykhb5lpqlffhpfcbrk08h8h29mg7jvd" } }, { @@ -78488,20 +78594,20 @@ "repo": "daut/miasma-theme.el", "unstable": { "version": [ - 20241201, - 2218 + 20241225, + 1559 ], - "commit": "c7a424832aaf982cdb2853b269f2b6fc43685195", - "sha256": "1l3zs0jxbbpnn18n9f22jgqsgpnk7bpy99is1nl163dhphna4jzz" + "commit": "251408da3b7243035c773c5c299353ab36bd2ec0", + "sha256": "0pb2caf4bj1aynj8mf1cy5syw0v3bf8xjxv78krpa6h9j3zpy7nb" }, "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "c7a424832aaf982cdb2853b269f2b6fc43685195", - "sha256": "1l3zs0jxbbpnn18n9f22jgqsgpnk7bpy99is1nl163dhphna4jzz" + "commit": "251408da3b7243035c773c5c299353ab36bd2ec0", + "sha256": "0pb2caf4bj1aynj8mf1cy5syw0v3bf8xjxv78krpa6h9j3zpy7nb" } }, { @@ -78732,15 +78838,15 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20241201, - 2106 + 20241213, + 1102 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "0e6054359a1826694d50a1be18c419b485ab3d81", - "sha256": "04hx6rk1snwjkpvgapqf9naqqac0klk6f0wlxfb9ndx6j60865hj" + "commit": "d0fd92f30db71b8fd37cb7f8c18155d26ef8a2f7", + "sha256": "1183nwp245yi9vh5zfbzgkgmvhs15hs5w9rp4z8fdi44d4gmr28f" }, "stable": { "version": [ @@ -78963,26 +79069,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20241123, - 2136 + 20250101, + 1417 ], "deps": [ "compat" ], - "commit": "e04415dc028ba252f079cfc7d6dff3059a047fbd", - "sha256": "1y5a7najnfi2bxpigf0j686z0i07ss81z8dxxsw1vsjxfn47rhl2" + "commit": "7ccb5e23a54c10f64880d1f55676f86681ff2f07", + "sha256": "1rinshdxln1wvzf7by8gq9wiqgcqy406k5jl1f86jd17b3wv5bxx" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "compat" ], - "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a", - "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya" + "commit": "7ccb5e23a54c10f64880d1f55676f86681ff2f07", + "sha256": "1rinshdxln1wvzf7by8gq9wiqgcqy406k5jl1f86jd17b3wv5bxx" } }, { @@ -79038,11 +79144,11 @@ "repo": "AjaiKN/minizinc-ts-mode", "unstable": { "version": [ - 20241202, - 17 + 20241227, + 1909 ], - "commit": "0587165602bcf8c6ab768be9cfdc5465d1f1febd", - "sha256": "17xihxspc0rii0zz5996rn5zh99vqqya4jwnynkmv2jbpr843k7l" + "commit": "0c01f72a6c767bb47ed6c01b70a5f6021fe191cb", + "sha256": "1mx0pxmzqjl65clhfxa1m7h65m6bckki24p0pzrk11v0j18l16xj" } }, { @@ -79146,15 +79252,15 @@ "repo": "liuyinz/mise.el", "unstable": { "version": [ - 20241106, - 1515 + 20250102, + 1433 ], "deps": [ "dash", "inheritenv" ], - "commit": "6e32b3787dd926cc9d8e9202b5aaa82682398261", - "sha256": "10irz22ph0ic9v6l4x1m072nwq63d5j1i7jj01mmh428dnwc84v5" + "commit": "99e4ca1acd987099f84993bc8a2facb42628dcbf", + "sha256": "0z3z9svs6mf4iypskb6vdzwxjkhk5238b0gzggkys6gn1259fmf7" }, "stable": { "version": [ @@ -79178,19 +79284,19 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20241124, - 1049 + 20250104, + 1744 ], - "commit": "45f1b757a3c4bc75103a8eb3c687cd3c08b137c1", - "sha256": "0drssrc36pn6fafc45lgvk5iskz0970hjqr2v1ri8xrymvrb9idh" + "commit": "e53cfba60cf956294979cdf25e0871425ad5f4c7", + "sha256": "10pfps6mvgwgfxkaccqvk539ld5zdcxf4f6ayxc0ad50x65z2izk" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "f70ea7f5c91f5df6ac0d3a09eaccc283fbdbce70", - "sha256": "16l0smp5y2ss9802jijjxs0v42sgcswlpambkc4fa17n47zbb4g1" + "commit": "cdf32f4c9f803633f4d2684a70d48858c142faf8", + "sha256": "0wyhv6skml0p9lajhmfbwc8wm3r1107kgwyvh31dyi9m4zhc52zh" } }, { @@ -79408,6 +79514,38 @@ "sha256": "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz" } }, + { + "ename": "moc", + "commit": "03f5ac511e3d23cd9cf8eb1c8e328bf2bf1c7acc", + "sha256": "1dah2941n3s59zqa7fwcmk2dm4vyic09jppszsm9vy9888s540w0", + "fetcher": "github", + "repo": "positron-solutions/moc", + "unstable": { + "version": [ + 20241229, + 1056 + ], + "deps": [ + "hide-mode-line", + "transient" + ], + "commit": "84acdd7d74cfd3b35637b84d49c53db203f657ce", + "sha256": "0p5k6jx37z0wgwxj8k43pfl4p25h32zj4myyjbzwa5zixg37j0kk" + }, + "stable": { + "version": [ + 0, + 6, + 2 + ], + "deps": [ + "hide-mode-line", + "transient" + ], + "commit": "fda3cf6fae0ccd195cb69c440a56a8a18a7acaf3", + "sha256": "0gd4mfsp9mcwz2ki8ipxpnnadkrg6q1p9vdgyc7a2ky3ldhx4i0m" + } + }, { "ename": "mocha", "commit": "39c26134ba95f277a4e9400e506433d96a695aa4", @@ -79775,11 +79913,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20241120, - 542 + 20241228, + 1050 ], - "commit": "df1798234edd56678da975d0d65b64bdebafc314", - "sha256": "0n7sbap1y72l9z8ifngfkl1bm2zgmx570i2dc0yd41la54q9ka0r" + "commit": "d807e1f013d1dae0e44860f45c9e9b7b4cb2ce49", + "sha256": "0lfr9irp6c86922sg6gjsllnn2lh3n3wh9nbjiz0vpzjyv6jyr99" }, "stable": { "version": [ @@ -80137,26 +80275,26 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240805, - 1425 + 20250101, + 1418 ], "deps": [ "compat" ], - "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e", - "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp" + "commit": "26dd59b300c149a0e2e332023115b280b42ead12", + "sha256": "1byphhdp41cn2qs91la6fvgzrwgbyx4yaajknvwz8qxzgl2c4aq2" }, "stable": { "version": [ 1, 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e", - "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp" + "commit": "26dd59b300c149a0e2e332023115b280b42ead12", + "sha256": "1byphhdp41cn2qs91la6fvgzrwgbyx4yaajknvwz8qxzgl2c4aq2" } }, { @@ -81155,16 +81293,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20240401, - 1150 + 20241206, + 1347 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "e0f60e314d034e02fbc3696c3cb9e3598eed9070", - "sha256": "0n6s4qab595rda1xfyad9qvry1ipfih4jzkaxabhw3a60jk3h3vy" + "commit": "0187c2197761af6df87193c5c1ebd3ed7759f695", + "sha256": "05mz45p9f9b39jwm0p41v4mm0xmq0fw3dyqlq8slwllkzyqzf11r" }, "stable": { "version": [ @@ -82016,11 +82154,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240715, - 1925 + 20241216, + 1955 ], - "commit": "cca6f1913cc899efaa59df52b8f09dd1a0768e20", - "sha256": "0a3fyzrv34k0q8df9iq4wqjsyqqxpvswndslakki6mkg3xl35f64" + "commit": "ae7496d54bf279f8fd82ba0a35504b4d6e3a5099", + "sha256": "097h3dpx9shnknwrp47w6s7nh11vk83x3yzi9bwb8dn0pz5pwihj" } }, { @@ -82617,11 +82755,11 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20241017, - 1337 + 20241209, + 1218 ], - "commit": "78ffab1868dc04b2eec5d7195d2d8f92c416e528", - "sha256": "0z3imz4b2j64pri0nml3v4lhlycw5ah271q4qi5g8qifbfn9anms" + "commit": "0b7373dd1b5a0dc7f8aff83b8e65d75d7d5e23bc", + "sha256": "1hbhab0xc7hksfpmjd93zg8xsch3vjnq67hz99s91l8hnqcik939" }, "stable": { "version": [ @@ -82664,11 +82802,11 @@ "repo": "Fuco1/neon-mode", "unstable": { "version": [ - 20180406, - 1156 + 20241220, + 1304 ], - "commit": "99d15e46beaf1e7d71e39a00cce810df1f33229d", - "sha256": "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642" + "commit": "23b12659d72a9520850bca72fe64bb7b06fc7b6b", + "sha256": "1wxlnb3w5nf5l50l5r45r7mkasj2rm7xas3pszfa67paaqgxa1d2" }, "stable": { "version": [ @@ -82718,11 +82856,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20241106, - 1533 + 20241230, + 716 ], - "commit": "a6ee08f1619bcde1a69b2defcfe8970c983640c1", - "sha256": "16k8wlvpxmjbvrn6abkgk6f97im9d1vhxlwmf81ypfrj9x05fwqg" + "commit": "546ee20caf825e65da4c5435d31f13d269ed2a81", + "sha256": "0vmzywzaizphj15rqvihw1znjp1i74w8fkhrg7kvic10iv0fpga8" }, "stable": { "version": [ @@ -82742,15 +82880,15 @@ "repo": "rainstormstudio/nerd-icons-completion", "unstable": { "version": [ - 20240731, - 1213 + 20241221, + 1846 ], "deps": [ "compat", "nerd-icons" ], - "commit": "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420", - "sha256": "03kkyxc9v38v1fc69xqc70gwvsq4pr8bgsk8f6is9z2w7p4y08sm" + "commit": "8e5b995eb2439850ab21ba6062d9e6942c82ab9c", + "sha256": "0nbyrzz5sscycbr1h65ggzrm1m9agfwig2mjg7jljzw8dk1bmmd2" } }, { @@ -82761,14 +82899,14 @@ "repo": "LuigiPiucco/nerd-icons-corfu", "unstable": { "version": [ - 20241101, - 2309 + 20241202, + 2355 ], "deps": [ "nerd-icons" ], - "commit": "721830b42b35e326a88b338fc53e4752f333fad2", - "sha256": "0mls7hz1c2f68lzj4g38plgxyndr3km8lpzyi91ssg4j61zmrbgm" + "commit": "41110180ceab9d0edaa856d19633b2b3fdf82e75", + "sha256": "0mwng5khhq6iqmr0ip8fv227cnkv0mv5664qz57r7sbjplqyabgf" }, "stable": { "version": [ @@ -83026,11 +83164,11 @@ "repo": "vekatze/neut-mode", "unstable": { "version": [ - 20241130, - 1223 + 20241207, + 16 ], - "commit": "2373c428f314948d433cb6070b237b6243922312", - "sha256": "1zvngs8fnpywgn7ryrdb78rj0b730fy1brbl1zqzqzhb4rj54pxh" + "commit": "7b599bbe96b77ac75b9c2c5b857126749501b70b", + "sha256": "0ivyair2xfyg5agxvfic6k89nw1i5sni400rhk9s8xfa11d4smxg" } }, { @@ -83162,6 +83300,27 @@ "sha256": "1zal05l3lnb41pvfxwkzrcf39g7amqbaaffxn3wz7qa45gvvc6fw" } }, + { + "ename": "nice-org-html", + "commit": "fd01900a0f11abf8cdae56a84cc6e3c743fce4db", + "sha256": "1gm8z02afyikdwd923gznc05j48hl7iigq2gici0ygdqa9cjdr4y", + "fetcher": "github", + "repo": "ewantown/nice-org-html", + "unstable": { + "version": [ + 20241227, + 800 + ], + "deps": [ + "dash", + "htmlize", + "s", + "uuidgen" + ], + "commit": "aeb00c4d89f51991cc697b7b52ecdb9ae88866cf", + "sha256": "1lrj4gd4kc3lb8jyfv8cb1gc4zjkr8a1mz08y8fpv8s1l8llf9p1" + } + }, { "ename": "niceify-info", "commit": "0b2a923da7363d904eb848eb335736974e05dba1", @@ -83774,24 +83933,6 @@ "sha256": "1wz2kszrgi8mljhl8rv3lms7if8vpja7bq4yi89cfyf8yrbm5cz8" } }, - { - "ename": "no-clown-fiesta-theme", - "commit": "7e4b0a546f6e2038369a816936e3a80436e3bc86", - "sha256": "0rf411gx8ci4kyhp86njjh41pvhr0pjzxwpg6nhhkq9aq3smyyan", - "fetcher": "codeberg", - "repo": "ranmaru22/no-clown-fiesta-theme.el", - "unstable": { - "version": [ - 20240725, - 2030 - ], - "deps": [ - "autothemer" - ], - "commit": "d97f521d4e29181af59412ac32de34ca487345d8", - "sha256": "0nf57jasppbnp0df968ikdqyk094qaxlsxwkcinq4572175lgq9h" - } - }, { "ename": "no-emoji", "commit": "af6b04c1f95468254f2cf361964df9fd25d23586", @@ -83815,26 +83956,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20241201, - 2109 + 20250101, + 1420 ], "deps": [ "compat" ], - "commit": "74431db47edf44fc1f5f013033560f7bc4f26f24", - "sha256": "0l88l1np4s5925d6i33l1cas8mk0nwbgbyw7fa1akzj8qv6782sm" + "commit": "0c119d46cce5c018e162fae4b36fd95ef26a76ac", + "sha256": "1qr0spndzv03h0lcs2bjajadp9rg7clm506bnwbcqwfqxz9cxnvx" }, "stable": { "version": [ 1, 7, - 4 + 5 ], "deps": [ "compat" ], - "commit": "74431db47edf44fc1f5f013033560f7bc4f26f24", - "sha256": "0l88l1np4s5925d6i33l1cas8mk0nwbgbyw7fa1akzj8qv6782sm" + "commit": "0c119d46cce5c018e162fae4b36fd95ef26a76ac", + "sha256": "1qr0spndzv03h0lcs2bjajadp9rg7clm506bnwbcqwfqxz9cxnvx" } }, { @@ -83860,16 +84001,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20240317, - 2321 + 20250102, + 2211 ], "deps": [ "kv", "request", "s" ], - "commit": "7d68b5a580c64123f3bbd75f795a891dfdeb1746", - "sha256": "124ak5qvjlg3kb49wmx8pbvdpqz6g79ji811kjvxf9d5gbv85714" + "commit": "d162d19dd057430840a08ede0ce333fc30ea5ab9", + "sha256": "0gvvdz40brkalviizyvfx3ir05k2qm71ic7va43a5381862cm2fx" } }, { @@ -83903,11 +84044,20 @@ "repo": "Lindydancer/nocomments-mode", "unstable": { "version": [ - 20170213, - 2037 + 20250103, + 1842 ], - "commit": "5a41a20cc44dfe4a9ea584354ed6dbc15dd92f46", - "sha256": "0jwwnypa0lx812p3dqqn9c05g27qavnvr23pzphydx9i15nz80g0" + "commit": "aaa9ef1042e0084fb774b3ee4274e1f8edb4d35e", + "sha256": "0yvxjby4x9bgbbp2a3j44l96z0dgi3xmjc2jq72fjgm12gzjals8" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "aaa9ef1042e0084fb774b3ee4274e1f8edb4d35e", + "sha256": "0yvxjby4x9bgbbp2a3j44l96z0dgi3xmjc2jq72fjgm12gzjals8" } }, { @@ -84163,20 +84313,20 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20240626, - 1936 + 20241204, + 2203 ], - "commit": "72043ab206dea50b366b3848e8f66c0a7737bda4", - "sha256": "0mlpqzql5jghssnx9i474gvc0rdj2sw9wsd46pgs2xn7lcqfjgrf" + "commit": "bc7264f14461197919b434f7a30a319873404147", + "sha256": "13gy1si8jylsf45hkigvgplwi110x2jb3fpxih3jg81ili7909xy" }, "stable": { "version": [ 2, 0, - 2 + 3 ], - "commit": "012dc83458dd3d453106806b2590058d5d0f1fdd", - "sha256": "1mffyld638k488zwbn64q17xl9ihaa5dyjvyq74yp4yfn72dsyvc" + "commit": "608af63b232a8f743277cf274803eddb95c7dcd0", + "sha256": "03fcs1whl4palw515lpyxxqhgirva1xnf427nh5jlr22b7hgcgmk" } }, { @@ -84432,30 +84582,30 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240805, - 1916 + 20250101, + 1804 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240", - "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l" + "commit": "f9006043702a3d0178d0118d8348c5733c1c81aa", + "sha256": "0pj20k27d1scdva5wh2gxpiv8360gj19lkzd5ljw6x0v6inmh6iy" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240", - "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l" + "commit": "f9006043702a3d0178d0118d8348c5733c1c81aa", + "sha256": "0pj20k27d1scdva5wh2gxpiv8360gj19lkzd5ljw6x0v6inmh6iy" } }, { @@ -84535,27 +84685,27 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20220428, - 927 + 20241222, + 1207 ], "deps": [ "jest", "transient" ], - "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", - "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" + "commit": "45ac45b700c97b61e3133e7a17befb4ebc1d4332", + "sha256": "1z9k3j2bxp5s1749ayjhniv9amqd841dsp1ckn4gi57r5cbcxxfh" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "jest", "transient" ], - "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", - "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" + "commit": "45ac45b700c97b61e3133e7a17befb4ebc1d4332", + "sha256": "1z9k3j2bxp5s1749ayjhniv9amqd841dsp1ckn4gi57r5cbcxxfh" } }, { @@ -85157,20 +85307,20 @@ "repo": "KeyWeeUsr/ob-base64", "unstable": { "version": [ - 20240211, - 1201 + 20241209, + 748 ], - "commit": "28a8f448fd706a071b351634482e5c46f80e7d46", - "sha256": "1ar12skshi2x2hfrlpy4b2029gqv7wz0cj4a8gjr0gs1hvaj2faz" + "commit": "6d3ef9d937838eb69b0a91e4012a0b6084ba26e1", + "sha256": "1dikvwvf9b75fxlav0fwz5nm0xwcp66zqiz1j54dcj2p7z3qxixa" }, "stable": { "version": [ 1, 1, - 5 + 6 ], - "commit": "28a8f448fd706a071b351634482e5c46f80e7d46", - "sha256": "1ar12skshi2x2hfrlpy4b2029gqv7wz0cj4a8gjr0gs1hvaj2faz" + "commit": "6d3ef9d937838eb69b0a91e4012a0b6084ba26e1", + "sha256": "1dikvwvf9b75fxlav0fwz5nm0xwcp66zqiz1j54dcj2p7z3qxixa" } }, { @@ -85482,26 +85632,26 @@ }, { "ename": "ob-deno", - "commit": "d7f97f342c1490e6891fbc55661efb504434b813", - "sha256": "175i9xw6f31b69d941l4yjj7f4hw5sqh5wzk3gh2s1klx5znvi47", + "commit": "8fb2e12f0e8b80d3f6ba31cb0b9fd01b5c16b18d", + "sha256": "1pwgnsbnn1zy51s17sjjcmhdyll41qrivwhkiyy53l9jp2ivr536", "fetcher": "github", - "repo": "taiju/ob-deno", + "repo": "isamert/ob-deno", "unstable": { "version": [ - 20201019, - 101 + 20241228, + 1629 ], - "commit": "e3b06d7662687e402905b9de4ad1d5816e89b842", - "sha256": "048xry2bj3xkkjw8n8lmwrjv1rhyhgf7xf8k86vw64754z5394xm" + "commit": "fae3e100cc5eed950a52d6cbc93130127ec20830", + "sha256": "10qpb0x05jx2ak3wgcp5l1zlljchwybiq0jbajyg5aazli3fhixq" }, "stable": { "version": [ - 1, + 2, 0, 1 ], - "commit": "e3b06d7662687e402905b9de4ad1d5816e89b842", - "sha256": "048xry2bj3xkkjw8n8lmwrjv1rhyhgf7xf8k86vw64754z5394xm" + "commit": "fae3e100cc5eed950a52d6cbc93130127ec20830", + "sha256": "10qpb0x05jx2ak3wgcp5l1zlljchwybiq0jbajyg5aazli3fhixq" } }, { @@ -86600,11 +86750,20 @@ "repo": "Lindydancer/objc-font-lock", "unstable": { "version": [ - 20141021, - 1822 + 20250103, + 1606 ], - "commit": "34b457d577f97ca94b8792d025f9a909c7610612", - "sha256": "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk" + "commit": "c971d72599e5a943e8552f929562346ed15446ce", + "sha256": "1cs2sl3b3nh7b08qgqrbsbq1g6sn01024ahq0xpasy68v9hlj8ic" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], + "commit": "c971d72599e5a943e8552f929562346ed15446ce", + "sha256": "1cs2sl3b3nh7b08qgqrbsbq1g6sn01024ahq0xpasy68v9hlj8ic" } }, { @@ -86707,6 +86866,21 @@ "sha256": "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b" } }, + { + "ename": "ocaml-eglot", + "commit": "7412953fc160708dd9afb1120044b0a997f493ec", + "sha256": "16pi2hfsq6mr4w2b7j3g78mmfssd1rjih7nn6nf1cjvfrfbdpdlp", + "fetcher": "github", + "repo": "tarides/ocaml-eglot", + "unstable": { + "version": [ + 20241230, + 1328 + ], + "commit": "7bb5b4ec64a9037b10b316cd48e2e3bfb3d5e662", + "sha256": "1zw311kz9wwcjyrk4jvvycfh5ihldm7y46kf308fv0hn1dlymc47" + } + }, { "ename": "ocaml-ts-mode", "commit": "4d8c5759648815c4f502f25b674e79ac3ef2396b", @@ -86730,11 +86904,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20241129, - 1514 + 20241202, + 1532 ], - "commit": "72cbfd716e619cb8ae3ae52cc0c5288eb2a2f2a8", - "sha256": "0fz8a92xdims2rnmhlv60yv5ylci80n4qgavg6jsfaf6fljz13gg" + "commit": "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1", + "sha256": "0wdzv54s31lckkkwf776j7npcd7i2sscdy9asiaxy50vgi4y7kbx" }, "stable": { "version": [ @@ -86742,8 +86916,8 @@ 27, 0 ], - "commit": "72cbfd716e619cb8ae3ae52cc0c5288eb2a2f2a8", - "sha256": "0fz8a92xdims2rnmhlv60yv5ylci80n4qgavg6jsfaf6fljz13gg" + "commit": "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1", + "sha256": "0wdzv54s31lckkkwf776j7npcd7i2sscdy9asiaxy50vgi4y7kbx" } }, { @@ -86945,26 +87119,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240905, - 1335 + 20241218, + 1342 ], "deps": [ "org-re-reveal" ], - "commit": "06538b2073d51197f428f78ff60ebc0e904cc6f6", - "sha256": "1z0jl9f0nj22rqf6izj5k87zas76fxifxx818gazx81vd2xhydxi" + "commit": "a0b9d95e0b17cce0bcccdfbcb813381c18d1eb7e", + "sha256": "0f8cfbf0jkg181jbbfl2d7v4l1wgpfwhcm4amcr2ghy9ls0visfa" }, "stable": { "version": [ 4, - 27, - 1 + 28, + 2 ], "deps": [ "org-re-reveal" ], - "commit": "06538b2073d51197f428f78ff60ebc0e904cc6f6", - "sha256": "1z0jl9f0nj22rqf6izj5k87zas76fxifxx818gazx81vd2xhydxi" + "commit": "a0b9d95e0b17cce0bcccdfbcb813381c18d1eb7e", + "sha256": "0f8cfbf0jkg181jbbfl2d7v4l1wgpfwhcm4amcr2ghy9ls0visfa" } }, { @@ -87859,25 +88033,25 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240926, - 921 + 20250101, + 922 ], "deps": [ "compat" ], - "commit": "96b74d2450ab4ab1a175d0e86c62f6695c4709b5", - "sha256": "0iiyx105fxd0c54h36ypxcjgirj53r89pl2ivir3mw5q9icq0wr5" + "commit": "411051c3257d60f0492cf88065193bb443b6ca0d", + "sha256": "05n5h53z3siz2ks9zb3k2p070mzzi7m2shrdjyxvylyxl1nybl5n" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "416c62a4a8e7199567a5df63d03cf320dc4d6ab0", - "sha256": "0yqnbcrf8ai1fivd13d8w619qwjd51rf4pqyakqp2kf02z7m4kpb" + "commit": "2b7a1688f24cc8ef5a3c3a6dab8e00d833bcda59", + "sha256": "0w7vrhqg3klr0zxnijmfgfgr5nf6z3cmlrbw3qz9y7z2p2ll5w8m" } }, { @@ -88051,28 +88225,28 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20240612, - 137 + 20241225, + 2356 ], "deps": [ "alert", "org" ], - "commit": "9d54b9d0956b2f9e199d8add48d544d09e58794c", - "sha256": "1nhbr8f137c2hxysc2sggnz095ah8qchrmx6g9ligq6gl3v0k7fj" + "commit": "0bc04cea718387134c37c9fc4c22215adc3f79db", + "sha256": "1r5yr5gwy9wb9wdm42jyn50gh8lqsqkx7kdb7da6z6l8isqmkvd6" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "alert", "org" ], - "commit": "87abaeac60e37fda530787988e00307a1f72fedb", - "sha256": "0svvzlp79hgm0cgzbkyfs42j8vjnlzv76ny1y6lhamnh7clr9p9i" + "commit": "0bc04cea718387134c37c9fc4c22215adc3f79db", + "sha256": "1r5yr5gwy9wb9wdm42jyn50gh8lqsqkx7kdb7da6z6l8isqmkvd6" } }, { @@ -88485,14 +88659,14 @@ "url": "https://repo.or.cz/org-bookmarks.git", "unstable": { "version": [ - 20241115, - 1106 + 20241204, + 825 ], "deps": [ "nerd-icons" ], - "commit": "22c8d837b01b0967910d731592402b57f6d2a3e9", - "sha256": "0j6yraf7h6iri6aq5qbxkg38p4rzvvg0b7i6cb20xvqp4sl9rv58" + "commit": "a353f97c1ebe65ebd35287dfe3008b5414f7e8ee", + "sha256": "0pn1n815hi222w33p263crrspizdn22k6zs1r50nv1pgfph8bj6l" }, "stable": { "version": [ @@ -88631,14 +88805,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240908, - 2256 + 20241214, + 2358 ], "deps": [ "org" ], - "commit": "6a2683211baa4b4efed0ca210275bf68dbbcfc4f", - "sha256": "16d5kkmclffbv00c1dmshind912gp18wmqzrsaih6qz8kffsj0q6" + "commit": "875bebe266f28c77110779b7819227957faab2ba", + "sha256": "0bsdmar1s9cwn0i0rccyxpml8xbrmlb1a15b5xvg61adhqz6x8mw" }, "stable": { "version": [ @@ -88981,14 +89155,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240807, - 733 + 20241203, + 1941 ], "deps": [ "org" ], - "commit": "f0a430442b2ae60035dcd74fc6a76299875694f3", - "sha256": "1xs8693dhji2fa8gn3j3fr4qvp1zad0g71f9qlrd3ynkhgdai2r3" + "commit": "9d80dfa5bfe1eb503e79229cc2f19f841c563709", + "sha256": "117l9llrwavwynhp0ws7z9s9s4sjya69h8l97i24l0f7gxzbkgy9" } }, { @@ -89438,20 +89612,20 @@ "repo": "KeyWeeUsr/org-epa-gpg", "unstable": { "version": [ - 20240208, - 20 + 20241206, + 2357 ], - "commit": "817b8e732c72bacddd8574f2c8f64fb26a1cfcc9", - "sha256": "1mpl10np6smap70icw1hyrayfy0sbmz5zmgvaf74zvyf3g3y0f3l" + "commit": "6f3b8b77bdf63e96465322bbb545b96c9641d521", + "sha256": "1fckdl9dz13rfl69cq87i5ksw51j6n84fpvbj3qvi3iwfhgbs83j" }, "stable": { "version": [ - 2, - 1, + 3, + 0, 0 ], - "commit": "47357e0dcfb8860d5d5aa9f22c12e547a0eb50e9", - "sha256": "0g4v73mvc743a0pdhyk72bjia4n3n7v49jw2bmpp12m0pqvznjrx" + "commit": "6f3b8b77bdf63e96465322bbb545b96c9641d521", + "sha256": "1fckdl9dz13rfl69cq87i5ksw51j6n84fpvbj3qvi3iwfhgbs83j" } }, { @@ -89964,8 +90138,8 @@ }, { "ename": "org-iv", - "commit": "56c38111ad4b7e9f015122ff3151e15cfefff274", - "sha256": "1nphccwfl87yz72vj7xf8g4xn8zp7m9p8a35bi7cjz89hk5whx2b", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "0hzxkwk94w423px67c0naqhdxdpdwa6q5q7rzhfk5382rrhspixa", "fetcher": "github", "repo": "kuangdash/org-iv", "unstable": { @@ -90119,16 +90293,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20240101, - 4 + 20241229, + 1923 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "a68e40a8473ff18bef58a171245a9cdef6eee622", - "sha256": "1ks7zzvv45i9pblnd5w3845xzg18sn85a5w50gvflrx71dn3z8xs" + "commit": "f9959a4de148094e01e9f0b6232f61c6ff320eaa", + "sha256": "03glaxna9k4hnlw8grxm100w44p6blndnl3hngw2i8h8fly1bb4n" }, "stable": { "version": [ @@ -90225,15 +90399,18 @@ "repo": "seokbeomKim/org-linenote", "unstable": { "version": [ - 20241201, - 1208 + 20241231, + 616 ], "deps": [ + "eldoc", + "fringe-helper", + "lsp-mode", "projectile", "vertico" ], - "commit": "bbf8ea8667003ffbda497b8ec21aedeca0ab0ff0", - "sha256": "1zprrslqz0dzf6dfypgzs9xbsc25647r2xwd28pzag6yzd7mcf2z" + "commit": "407d2ac834d1de82dd1e37f4642f74a81cf03350", + "sha256": "12scyxmiirc50qqwxql976560ccipyjrlnxsifwhc7p6xr0jylii" } }, { @@ -90244,16 +90421,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20241130, - 1258 + 20250102, + 150 ], "deps": [ - "fb2-reader", "nerd-icons", - "qrencode" + "org" ], - "commit": "d3428752d3e961087ccc462593bd1a0922d3bb67", - "sha256": "1dcnpmbww6w96nw2bckzmq0mfk3w2zgks7xfxi3bpvwiqm512h1g" + "commit": "1edd6f4a0c4de076e1eddd7bff8e9e157b1cfbde", + "sha256": "0vcpb3mm5ln6ljm7ah8bn6w5l03fjaiqzja2pxq435pjkq0dg04r" }, "stable": { "version": [ @@ -90509,25 +90685,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240926, - 922 + 20250101, + 923 ], "deps": [ "compat" ], - "commit": "5b7e8195744f9b6a14a5c72bd13ae52e86952d72", - "sha256": "0pb7sxik2mkarbs5vxn0gch23zxj93yh1aw4bl6bbp60an561fp6" + "commit": "17549799a05a46d391765e36b544741a3a704cd0", + "sha256": "0pyaa0ay8zdw1mnndcfhqsik54nqjrpf1w1zbv6rqszj7ycf6rpq" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "e306c7df4985f77e5c4e2146900259a23a76c974", - "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m" + "commit": "8420e4f839bee2c34488ce94fa08212dfe0b2797", + "sha256": "0a7viid1lrn02w1n4yjivjyssbd1qq850giqwnp3mrjf9adwzh2a" } }, { @@ -90569,11 +90745,11 @@ "repo": "bpanthi977/org-mpv-notes", "unstable": { "version": [ - 20241119, - 1627 + 20241222, + 1958 ], - "commit": "f6c0fc5546cf7168d997a3605cce7c08714cb599", - "sha256": "013c90h8qajil7wk1m1q6kqxgl5812bd004lqn0k886mahfm75qn" + "commit": "1d8db9ff803122e2a9bfc1b41d806f3b70acfc57", + "sha256": "0fii5v7c47jshrv8d064sa7nssixm8hy2fwfjvqaqwpbhvkl3w23" } }, { @@ -90743,30 +90919,30 @@ "repo": "meedstrom/org-node", "unstable": { "version": [ - 20241201, - 2012 + 20241229, + 1555 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "c1e8d8b1e8bf9463c7b97f290a8307184a19c041", - "sha256": "05gniyrl3pffdaa6kbb5cssvmi0gjg6isnyk17zl3c23lf3s4mnf" + "commit": "823f2f3d3f2367e181fdcb81db48deafae6b3ae2", + "sha256": "15m5wn5qghglqpnhqn1nnpvnwp8jjn5fwcfzp1p89zw851ic44zb" }, "stable": { "version": [ 1, 9, - 10 + 19 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "c1e8d8b1e8bf9463c7b97f290a8307184a19c041", - "sha256": "05gniyrl3pffdaa6kbb5cssvmi0gjg6isnyk17zl3c23lf3s4mnf" + "commit": "823f2f3d3f2367e181fdcb81db48deafae6b3ae2", + "sha256": "15m5wn5qghglqpnhqn1nnpvnwp8jjn5fwcfzp1p89zw851ic44zb" } }, { @@ -90777,8 +90953,8 @@ "repo": "meedstrom/org-node-fakeroam", "unstable": { "version": [ - 20241127, - 1306 + 20241229, + 1552 ], "deps": [ "compat", @@ -90786,14 +90962,14 @@ "org-node", "org-roam" ], - "commit": "288d897e12713db7d15162ccf3bdc93147f00943", - "sha256": "1lrkqv5bkz2f15vp50j95nnffhl3ibbh47nq4mbl14wqil1bp89m" + "commit": "125ef95cee77a19d59d8e071aa14049dd2bbd1e8", + "sha256": "1m0qpixf8mnrfrp8p8z4zz8lqnz541lz02b8wkw90ajb81s6k7b9" }, "stable": { "version": [ 1, - 6, - 4 + 7, + 0 ], "deps": [ "compat", @@ -90801,8 +90977,8 @@ "org-node", "org-roam" ], - "commit": "288d897e12713db7d15162ccf3bdc93147f00943", - "sha256": "1lrkqv5bkz2f15vp50j95nnffhl3ibbh47nq4mbl14wqil1bp89m" + "commit": "125ef95cee77a19d59d8e071aa14049dd2bbd1e8", + "sha256": "1m0qpixf8mnrfrp8p8z4zz8lqnz541lz02b8wkw90ajb81s6k7b9" } }, { @@ -90989,8 +91165,8 @@ "repo": "emacsorphanage/org-page", "unstable": { "version": [ - 20230829, - 942 + 20241227, + 814 ], "deps": [ "cl-lib", @@ -91002,8 +91178,8 @@ "org", "simple-httpd" ], - "commit": "7a73b110df12c29804d32ecfb051d3320dce3892", - "sha256": "1ygil7c3hilfx630qld90f0y0klkll7svf3zvs885y9z7w30y5im" + "commit": "3641afab005b892b586a1e70da29201004c189c3", + "sha256": "1d77cmns0zj7mxik2qlfrxd5gxg2xsymyi0zij3cz3wa0adlj91q" }, "stable": { "version": [ @@ -91457,15 +91633,15 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240831, - 1242 + 20241218, + 1239 ], "deps": [ "htmlize", "org" ], - "commit": "91610ba9b010b05c52ae7ab77a7890851222db06", - "sha256": "09d0hy5nb485d3dd71a9dmjpbwvhj7zx1wwkl9hggc2gzj4f0snp" + "commit": "f04b2227f962c39afb18408b433d5d84d1e136fe", + "sha256": "1b7j1bnw51ad49vx3rbncxiq8jizbjbhfq18jmkxlaxkrccmz8bf" }, "stable": { "version": [ @@ -91802,8 +91978,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20241007, - 1704 + 20250105, + 443 ], "deps": [ "dash", @@ -91811,8 +91987,8 @@ "magit-section", "org" ], - "commit": "2a630476b3d49d7106f582e7f62b515c62430714", - "sha256": "1smllgrbg5idc7cjskaxj7pzgd28bmwa1d7w5x270hbjviw5k27c" + "commit": "cad3518788991623aa5621341471aef67108937d", + "sha256": "15v72fga505w9y7910lsjxkhhllfrv5sqvlksfvx5lyfcmjkk9zm" }, "stable": { "version": [ @@ -91871,8 +92047,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20241130, - 256 + 20241231, + 1802 ], "deps": [ "dash", @@ -91882,8 +92058,8 @@ "s", "transient" ], - "commit": "661e388bba2b71b2d8b3db287b7f77e400b452f6", - "sha256": "0l16gm93cyfvi9wcyrvrb20sdmgz6dgcrc2f2daxhdypkc4c3dzd" + "commit": "2b7cf0110c5c13b26c3e1b35c9854263089ba13e", + "sha256": "0gwd4cyhwmnwkzc6ps5pikdf1ak17y1k006sl1b0sc2lwxyr4p4v" }, "stable": { "version": [ @@ -92049,16 +92225,16 @@ "repo": "ianxm/emacs-scrum", "unstable": { "version": [ - 20200131, - 1129 + 20241231, + 2251 ], "deps": [ "cl-lib", "org", "seq" ], - "commit": "a383348ea80c2459bfb96fa0652b98f0059bd311", - "sha256": "12qw1qs22j367p1lxwq2wihn7h8h6mk9alv2v13qgjm6w2jnffbz" + "commit": "c1da15f576c8f55245df4804221c3b0efa7fbf40", + "sha256": "1nnah93fd0a5jcyxk0b3xkdi5r7p1izl4qmykgd9i6kjzqp7srss" } }, { @@ -92094,6 +92270,24 @@ "sha256": "133mww4fdlkigd5583c45sjb2g34f512h50x65iipy0qmrvj95i0" } }, + { + "ename": "org-shortcut", + "commit": "2dc71a43ec3cc8f53f0d7c2ba2297c80fbb3bfd2", + "sha256": "0i82r53fr81myddn0rcv7fq9cp5qprnzb3v0nqr2jq8rdz023xd6", + "fetcher": "github", + "repo": "Endi1/org-shortcut", + "unstable": { + "version": [ + 20241228, + 1533 + ], + "deps": [ + "plz" + ], + "commit": "69f444830d31e89f2693449f9c122f25989930b9", + "sha256": "1pws0v49qyba7fhi0afv5k9jvpizxf8lhnp8hx9dq4mz9y40xpsq" + } + }, { "ename": "org-side-tree", "commit": "b6d4afd131465bf190a2e5b6d36f31d63b5cae24", @@ -92197,8 +92391,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20230721, - 43 + 20241227, + 124 ], "deps": [ "dad-joke", @@ -92209,8 +92403,8 @@ "s", "seq" ], - "commit": "d7bdf9fcfe28f96f9470719f3985a6e413592de8", - "sha256": "060sfkh05fnrk8sfciszggxmyxyp7851i5zx4w9j2ki7kw8rfp2b" + "commit": "92443a7a346c60fd00e05464f9af7763a055e4ca", + "sha256": "158s48xznd1kfbrchqjlcm05jcbv1gcwmhzypq0klf0w4pbrhipy" }, "stable": { "version": [ @@ -92574,14 +92768,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20241109, - 445 + 20241229, + 516 ], "deps": [ "nerd-icons" ], - "commit": "4eb1b403a004daf20bb622c6b708d1c743bbc01a", - "sha256": "1hh3f63pf88x9jabwhjis6cpcm9h3rzzq6jjfgqa8vig4fzsa85z" + "commit": "245ac5f991f073a4baa68c01cf5330a4fe29bee7", + "sha256": "0rpps1grr0xzjghq6wr6k8c7w8mg3sfwprydgkqwm0pz18ac9rwy" } }, { @@ -92673,14 +92867,14 @@ "repo": "jxq0/org-tidy", "unstable": { "version": [ - 20240110, - 114 + 20241212, + 28 ], "deps": [ "dash" ], - "commit": "26d9636f0c43f1ee3f0528880111a4c1dd2bed32", - "sha256": "195wl2y38g76n0kcp47inq1jm5v1kxprh99xgp05bfgv6wf4i1hf" + "commit": "0bea3a2ceaa999e0ad195ba525c5c1dcf5fba43b", + "sha256": "1rwq53j31vixyhsi7khb1xc0fcqdmqyp7ycq5hinligfxk87sr4s" } }, { @@ -93524,8 +93718,8 @@ "repo": "tumashu/org2web", "unstable": { "version": [ - 20210203, - 324 + 20241226, + 1757 ], "deps": [ "cl-lib", @@ -93537,14 +93731,14 @@ "org", "simple-httpd" ], - "commit": "6f5c5f0cc5c877ac3a383782bbe8751264d807b6", - "sha256": "12rgrmcp91y27zcq8kcqvndb38n6ix4amf13cc2gjhi6aayxxx7k" + "commit": "0e343770b9785f6150afc98153cd00a316d88d01", + "sha256": "103fzmadgd93x1y0c6xsdjx70z0jkwpvj0xnkybdancxz4ba8p9l" }, "stable": { "version": [ 0, 9, - 1 + 2 ], "deps": [ "cl-lib", @@ -93556,8 +93750,8 @@ "org", "simple-httpd" ], - "commit": "5243b399927a4c474bb3b8d1c8a00799df1f27d7", - "sha256": "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7" + "commit": "0e343770b9785f6150afc98153cd00a316d88d01", + "sha256": "103fzmadgd93x1y0c6xsdjx70z0jkwpvj0xnkybdancxz4ba8p9l" } }, { @@ -93583,8 +93777,8 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20240101, - 929 + 20250101, + 1012 ], "deps": [ "dash", @@ -93592,8 +93786,8 @@ "ht", "s" ], - "commit": "93b1d10a82103d38d8cba09d90b9faf219205df3", - "sha256": "1jzzd0qndd9rlds451ww9lwjdbfhlayqbhn9rmsivsiv71gncfm7" + "commit": "6221c85b37d7baee27288848fa38d5519cdeafd5", + "sha256": "16ffv1il866i8az6lddkhpjdvbslhsab2xk34byb08f817bczbq4" }, "stable": { "version": [ @@ -93776,16 +93970,16 @@ "repo": "isamert/orgmdb.el", "unstable": { "version": [ - 20231003, - 2144 + 20250104, + 1911 ], "deps": [ "dash", "org", "s" ], - "commit": "4338a0a34d500a214df8293590960011f761fe24", - "sha256": "1yr553kf6kmq2n328jr6pgxxifkwy2nk1c4w1xjy9m3x7zs1rpsq" + "commit": "04c4ea707b7313c3613517baabeae209e2b08a52", + "sha256": "1n24v2nlbr99rl2x2cvxfav7vj51x104myvsfd6cqia661vhrpsy" } }, { @@ -93878,11 +94072,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20241002, - 2020 + 20250102, + 748 ], - "commit": "fec29053dc6ed97e6b1cae60bc97cb9b8700f3cf", - "sha256": "1psjimmanmh3hp7paq86wwim9z64bhrwy0gn3fkxy1nf76p3lrjx" + "commit": "366677c0a5792cdcc5157362fd36416c76b9660b", + "sha256": "09lrprny3a9hb0wc5y7mclfcdnvlzr3ai9x4inmikngx3m469rkb" } }, { @@ -93908,11 +94102,11 @@ "repo": "tbanel/orgtblfit", "unstable": { "version": [ - 20240228, - 716 + 20250102, + 735 ], - "commit": "a22f3a137f3590d7f13c3be38bbd1e55d39cb2ad", - "sha256": "1mpfxvgjd7cgjdpndibbw2zcsnca8hckd0s25sfy0dbcvdsn6hb7" + "commit": "3ab53c983b647fec4dfdd0e3e25bc5d247130c70", + "sha256": "1khmvk44g9p17w2pkz6zd46j1x0mz66h77arddgdrs280yps26vy" } }, { @@ -93923,11 +94117,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20241002, - 2012 + 20250102, + 758 ], - "commit": "30cd50e2e913d41d8ee74ed3c0ca0b1fd8c2e264", - "sha256": "0rh46an7iqzyrvfd535lgy4l0kyycnlywkdnl2x0jwnha9fp4r9x" + "commit": "0b16ccdfadb55bec75d91edea2caaa1a161146ff", + "sha256": "01kws6m021msrmpsplkz3lzwp85ajpq7h25374hnz82rrn2hgksm" } }, { @@ -94086,25 +94280,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20241122, - 130 + 20250101, + 924 ], "deps": [ "compat" ], - "commit": "6a2416dc4c3be22573cd9f5fb285df3f4bd6b6ea", - "sha256": "0cfwy4j5zv7axxkfg25cm4rs29d58w89gx58j4pprzf8pwxq6fvw" + "commit": "fa52c07484bb5ce57b066c7e59783be3f45205a2", + "sha256": "0616d0wphar6m97izrzyf48h6qh315n0i6fyi9pjp2ka05wxql24" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "compat" ], - "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691", - "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8" + "commit": "fda895f1c38ade3ced65f6142e2f5c0221c3380e", + "sha256": "1llk9zkr1a0gicxp7jzx3f674zlj780ghcgnxw8a2jf3kbrn0xb5" } }, { @@ -94359,26 +94553,26 @@ "repo": "abougouffa/one-tab-per-project", "unstable": { "version": [ - 20241129, - 1654 + 20241212, + 2306 ], "deps": [ "compat" ], - "commit": "5f3894c031cd0900739e3cabb3eca3b6eb56f78f", - "sha256": "0jwmlqia3h2rb0j1qnlylslajqiz5g28ll3qy7h1mlbh4vb7bk24" + "commit": "82c49c5c8551d2c0dd33f6b56549e1890d621651", + "sha256": "0dj8mfgzlmvybkg7z4cvaa75v0hq8sbv3fkd2wxs8mhz2hhvmxl2" }, "stable": { "version": [ 3, 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "5f3894c031cd0900739e3cabb3eca3b6eb56f78f", - "sha256": "0jwmlqia3h2rb0j1qnlylslajqiz5g28ll3qy7h1mlbh4vb7bk24" + "commit": "82c49c5c8551d2c0dd33f6b56549e1890d621651", + "sha256": "0dj8mfgzlmvybkg7z4cvaa75v0hq8sbv3fkd2wxs8mhz2hhvmxl2" } }, { @@ -94409,11 +94603,11 @@ "repo": "jamescherti/outline-indent.el", "unstable": { "version": [ - 20241128, - 1742 + 20241219, + 1754 ], - "commit": "7767c4a5393fcac626bfc29ceeba2f884b189aec", - "sha256": "1l1cpfqldrpxl7k2m0vad3yjmhsa3d9ni5lv1zv9ib8rgr8aagq9" + "commit": "7a3d0c896d85b28aeabede47b31e194cc88f8769", + "sha256": "0af0gy8yfknx05crsqzyvki1rsdhl107fk8fbk8fg0npxdgr3g5z" }, "stable": { "version": [ @@ -94448,26 +94642,26 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20240831, - 2209 + 20250101, + 1421 ], "deps": [ "compat" ], - "commit": "4628613f3570b865b2c22b750ebd41443c1848c2", - "sha256": "1ky204hgkvv69gv5vmfczmhq9df05d37qssg7mx041i5xriv54nl" + "commit": "66199fcbd64181f5d74e44ed03bd7bb4502fa547", + "sha256": "1zr0ix28vis4y88h8w6lf4lsp0x24qi5v2y3xsk6vi2am08w613g" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "compat" ], - "commit": "4628613f3570b865b2c22b750ebd41443c1848c2", - "sha256": "1ky204hgkvv69gv5vmfczmhq9df05d37qssg7mx041i5xriv54nl" + "commit": "66199fcbd64181f5d74e44ed03bd7bb4502fa547", + "sha256": "1zr0ix28vis4y88h8w6lf4lsp0x24qi5v2y3xsk6vi2am08w613g" } }, { @@ -95724,6 +95918,24 @@ "sha256": "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra" } }, + { + "ename": "p4-ts-mode", + "commit": "28d52e051460c76c021457b2a0792cf55e8183a1", + "sha256": "1hqpwbngvgds277j5sdmxdygrkdx91ifn5p5wrz29ws4r5fckhcw", + "fetcher": "github", + "repo": "oxidecomputer/p4-ts-mode", + "unstable": { + "version": [ + 20241215, + 2358 + ], + "deps": [ + "xcscope" + ], + "commit": "a2b8a0ecde12b23487dff2bb85b2a9dcd1962cb8", + "sha256": "11jk12i72v2p2569na2igbs1g0nlhwlv1l5ngs261wq51m9hm10d" + } + }, { "ename": "pabbrev", "commit": "c032b0d126e0196b4526ee04f5103582610681ea", @@ -95847,14 +96059,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20241123, - 2136 + 20250101, + 1820 ], "deps": [ "compat" ], - "commit": "c1b276904278f0f89da2684f5e044760e3232c29", - "sha256": "0lwn4fd996lf4i4jmxfn09jn06k66k19ff76fzg6zzrs3hcsjg3j" + "commit": "c8ddc4a9a23b8514a8ee8d95e508b58adbeebd64", + "sha256": "1f89570dphwzizk1yyzh630j4a7qd2bzrn2r5cnksin44zj8qlvp" }, "stable": { "version": [ @@ -95962,14 +96174,14 @@ "repo": "Silex/package-utils", "unstable": { "version": [ - 20220630, - 2345 + 20241206, + 754 ], "deps": [ "restart-emacs" ], - "commit": "0168172062467b1bff913ea955b2ef709b43ecfa", - "sha256": "0pghwwxmn90vfkdzl8fqc7zg3xkcx7lyiihjwvkgfmzmqs4hwn1p" + "commit": "8839e98870499c06c3bffe090b4e42a156509a7a", + "sha256": "00iw1zq0yjh1wqmzxb677b86nkhw0l7v9sf4abx9cmh955kfchg5" }, "stable": { "version": [ @@ -96635,11 +96847,11 @@ "repo": "mrc/el-csv", "unstable": { "version": [ - 20160512, - 1723 + 20241214, + 246 ], - "commit": "96bef1ffbc89ea12d13311c9fa239c5c3e864890", - "sha256": "06xg6f74697zmn042wg259qlik2l21k4al08a06xz4gv9a83nsx6" + "commit": "b2e7010ba91ecce25498a73f64f950de4dd8dbe2", + "sha256": "1prnv930zr2p6zdimiym8wwd2rp4yyjp7b6a8r8bkgyd7ydkpv3y" } }, { @@ -96650,14 +96862,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20240101, - 946 + 20250101, + 1011 ], "deps": [ "s" ], - "commit": "cdc4386ef8e94ccdeff3700021d4a944034ae559", - "sha256": "0nya7x9lhphnall1przkpircai9p5r8vc0jg6msrvr02azv2yky9" + "commit": "19df0d8d67f0f3b73d80ad2db57a1790f3e43beb", + "sha256": "0nl47mlhl27y4cz6qvbch7g3da8jlx08ll7jb99jhn390p4syhxc" }, "stable": { "version": [ @@ -96680,19 +96892,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20241115, - 2225 + 20241219, + 14 ], - "commit": "c0ee4d5f10bf801af03f633b6b73ced4a0ffead7", - "sha256": "1c6j45fvs8k8d5smyi4rd9n2rg79i7dv69n98md32qm8w2w7yi5x" + "commit": "db2de6e30a4fa2a56f165fe7a493307689cc7279", + "sha256": "1rgawqwa7dqfiz74fsj1z6nsmjp7dszrxm9jjc9kgnr8w4s3yb2a" }, "stable": { "version": [ - 4, - 7 + 6, + 3 ], - "commit": "26fb0fd165bacd160a5e89b966c6d080a740c4c4", - "sha256": "0rr1iy9j5s3m95j1kr2cqqk6mp5apva46g4zi3y07n120hz3ndw9" + "commit": "db2de6e30a4fa2a56f165fe7a493307689cc7279", + "sha256": "1rgawqwa7dqfiz74fsj1z6nsmjp7dszrxm9jjc9kgnr8w4s3yb2a" } }, { @@ -97715,15 +97927,15 @@ "repo": "overideal/perject", "unstable": { "version": [ - 20230605, - 841 + 20241204, + 1632 ], "deps": [ "dash", "transient" ], - "commit": "6357ab199c717191e7695a3e3c2545918b97a942", - "sha256": "0ll6110sxpykcbbqhd1i4hwvnhhnjgk75gnyzvmcj7s2phf3qjnw" + "commit": "27c6fdad199f930aff5b0fb1343654ee3b4c4205", + "sha256": "1wi61cy4bkwclsviwcfrhyxg0c9facbgx1jh5syqy6pmccw54gi0" } }, { @@ -98160,25 +98372,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20241110, - 1633 + 20241231, + 1316 ], "deps": [ "peg" ], - "commit": "3e7917dfe17d40c08f0028917915682dbf576ee7", - "sha256": "12k4y52rv7fwg8yqniq4d3bmhcxdn75kgzvr1qxn56l80hxzfhvs" + "commit": "912ad0086a81e672232fa319322a1226bb11fb3c", + "sha256": "0z5h1chpvyza7fzqg1li7nl2q7g35xsdpyk51ah34hk5vxq1mwbm" }, "stable": { "version": [ 0, - 44 + 45 ], "deps": [ "peg" ], - "commit": "3e7917dfe17d40c08f0028917915682dbf576ee7", - "sha256": "12k4y52rv7fwg8yqniq4d3bmhcxdn75kgzvr1qxn56l80hxzfhvs" + "commit": "e1510f691bd6bb124e73f6604187c81d2b0c667f", + "sha256": "10k166l3zh6wi59il147cal0p50md3dv618wnkg1clax51xk1h44" } }, { @@ -98196,30 +98408,6 @@ "sha256": "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj" } }, - { - "ename": "ph", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0xrg7d1mqgvv3s0l4biyyccn3bj1khs496rdwih91bazs634g2y4", - "fetcher": "github", - "repo": "gromnitsky/ph", - "unstable": { - "version": [ - 20161029, - 1522 - ], - "commit": "a66e38637d1898b2ec31ee611033ac3f295fd97f", - "sha256": "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "commit": "ed45c371642e313810b56c45af08fdfbd71a7dfe", - "sha256": "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p" - } - }, { "ename": "phabricator", "commit": "829010a578f34f0f2dfb36a0de01547c2950bb65", @@ -98532,20 +98720,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20241024, - 1241 + 20250103, + 157 ], - "commit": "31f702ee2de35d514fb633c0c37531cb648bff70", - "sha256": "0rz0qdi82swvvqmb44jdzwfkaz9xl4y4ic70i6i950rmrbz970pd" + "commit": "b45992a6a9d019fafe7a9dcde19401b0f20a20bf", + "sha256": "0810hbdakjasldl4vanigjhj7pixkq3dxad2w60grg0kb8xj9rz6" }, "stable": { "version": [ 1, - 26, - 1 + 27, + 0 ], - "commit": "9a2fe1c6c34f4f22f11efff0caf1d4e7c8ea233a", - "sha256": "12skkn3i5qvlfnifgyp3sm4yjikphckj98y73vhxn73zzbn2lw6m" + "commit": "c3fa4e020cdb631743dbb7b6007ea546a8db1f34", + "sha256": "0pkvqpzzy7wmbd99gvphfaz2ds79n5fcx4n7f772mgz8x5f9xq1b" } }, { @@ -98644,8 +98832,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20241128, - 1559 + 20241211, + 1614 ], "deps": [ "async", @@ -98653,8 +98841,8 @@ "f", "php-runtime" ], - "commit": "922a4339d796f16c393400ea273ddf61539edf82", - "sha256": "1dhss4qzllpgfp3xy2kdw2g2n70rzjzgz747rchx1rfb5vwhmwl8" + "commit": "bfbf23983828a067e1dc84d99a45523c60097252", + "sha256": "1a3bj2id25lg52qadh85svyjckzn0hh8n20lzddkfl8l11bzgvlr" }, "stable": { "version": [ @@ -99327,11 +99515,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20240923, - 1652 + 20241216, + 2246 ], - "commit": "b333ec39d0499492e91cfc0a2a932b956b519714", - "sha256": "0qy3q3803f72cz80mrdd2j9dnjs8rjby2agz244a0wjnq0521rmq" + "commit": "1531fd0e4112a633ead0a7ba72d51c2255a4b959", + "sha256": "1x1nlcywxik19ldy6bsykx7zhbgj20y50hw5r90ysii4yci4in08" }, "stable": { "version": [ @@ -99932,8 +100120,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20240924, - 42 + 20241225, + 117 ], "deps": [ "dash", @@ -99945,8 +100133,8 @@ "pocket-lib", "s" ], - "commit": "7f55668325fab3dcf1c24b10ee073f7d1df180a3", - "sha256": "08fxaffdzxr48lixzk7g9b4aaa107vyyws2ghcw0ismqrfhkq8gz" + "commit": "d507c376f0edaee475466e4ecdcead4d4184e5aa", + "sha256": "1hyjs6cp23cy10k7f0fdp4qz21ba0qmb04xmpdjl5wkwl0s5wfw9" }, "stable": { "version": [ @@ -100321,14 +100509,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20230317, - 1220 + 20241208, + 1024 ], "deps": [ "polymode" ], - "commit": "5ca02279a4e6f5025cd2c7b1196058d3e74dc5d5", - "sha256": "136bph3rmknfqf6kq4yz5wlxsjidcq6w42wis87lbknmphhg1jp7" + "commit": "90d9ca9f440d3b6c03b185353edd37a100559ec4", + "sha256": "15afhwy09ans90k9y265ihc45clq2y212azx8zwp18mqdx9m44fz" }, "stable": { "version": [ @@ -100733,11 +100921,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20240101, - 830 + 20250101, + 843 ], - "commit": "6fa7c440879ade009dd0ea37eccc771ced0ef86d", - "sha256": "0q3kpqip0mj8y8ws290v55z3krzlnrrynvj04qdfpkjxndh8ya3z" + "commit": "7a05700a37aae66d2b24f0cd8851f65383a5cf96", + "sha256": "1mphrwcdfcknkp874v4yk1pczqb65dyhgjlqwm3c8c2gx3map3mx" }, "stable": { "version": [ @@ -100889,6 +101077,29 @@ "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1" } }, + { + "ename": "portage-modes", + "commit": "03e50a626f3926b3e18b3ad764a0071be612de62", + "sha256": "1bm67r05wdxmc649n9r6vsigxggd1dplfnkdh12k0c17c1gac55m", + "fetcher": "github", + "repo": "OpenSauce04/portage-modes", + "unstable": { + "version": [ + 20241230, + 1837 + ], + "commit": "5f6b5aa7eb1d8508ca82e5ed1cb4da5870801161", + "sha256": "12fl3jx6r650cmiw6d9906ckbqdbcl5qiskz7r1z8dz968pmvn4y" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "5f6b5aa7eb1d8508ca82e5ed1cb4da5870801161", + "sha256": "12fl3jx6r650cmiw6d9906ckbqdbcl5qiskz7r1z8dz968pmvn4y" + } + }, { "ename": "portage-navi", "commit": "0a467702b3ac3c8bdc723262e6919f67fd71d524", @@ -100974,11 +101185,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20241023, - 319 + 20241202, + 1311 ], - "commit": "ac9f954ac4c546e68daf403f2ab2b5ad4397f26e", - "sha256": "0qq14z8qiwmx0dwbcz6nrhznj34jxkb47dcv1wf8v6qhnm4b7z2i" + "commit": "81651536827c96bf5af5265ee7918ab70e1dd5b1", + "sha256": "1jpwmzzzsv0p4iv20wk39apg9mahq48d63drlkr6n5ry246g99dd" }, "stable": { "version": [ @@ -101241,8 +101452,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20241105, - 1542 + 20241223, + 230 ], "deps": [ "ghub", @@ -101250,8 +101461,8 @@ "magit-section", "markdown-mode" ], - "commit": "bd9846fa0636bde8c6f9d88b9f2b9514903e82f8", - "sha256": "120ym24d2bccni9dwlk086sbqvfwmwj9kj61yfxh76j6dak28i9j" + "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", + "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" } }, { @@ -101317,11 +101528,20 @@ "repo": "Lindydancer/preproc-font-lock", "unstable": { "version": [ - 20151107, - 2018 + 20250103, + 1541 ], - "commit": "565fda9f5fdeb0598986174a07e9fb09f7604397", - "sha256": "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd" + "commit": "b16b59afcdc53614e6c3c272d1eaea592a832f65", + "sha256": "01c4yf4frvmjgwdkci2nfi1a2gk3lcl49pksys4r0cngsqmrcxfk" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "b16b59afcdc53614e6c3c272d1eaea592a832f65", + "sha256": "01c4yf4frvmjgwdkci2nfi1a2gk3lcl49pksys4r0cngsqmrcxfk" } }, { @@ -101954,11 +102174,11 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20240101, - 932 + 20250101, + 1011 ], - "commit": "71bceb21c9d9df3ee00c9fbd420fd0c2733941a1", - "sha256": "0kd0li894vr9741fmg9cfxcb8lqchwy61v2idbr4d0ilap8l9xbq" + "commit": "05eaf3a0f00b68d427b76cd0410519783999807d", + "sha256": "0sl8jrg7gscbc3914nx8cn32fr00xvlihy1aza04b5lf0k0l3qcg" }, "stable": { "version": [ @@ -102153,26 +102373,26 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20241107, - 330 + 20241220, + 1028 ], "deps": [ "project" ], - "commit": "404723d0b16dd46a3c0a63675d1f0ab9083799db", - "sha256": "16krbqz3x0cfvwcc6iiw6ly4n5v38d664gfa7bslv4xgr25s9sm3" + "commit": "1faaa975c99e358165cfc3df160c21c2c611e1c3", + "sha256": "0wg1biic9sfsdhq1x1hkcbr396vkklhzz2f6an22amk2jc1pmfnn" }, "stable": { "version": [ 0, 7, - 0 + 1 ], "deps": [ "project" ], - "commit": "ff1b159faae5e4f4756e5fc5f01b4a2a304ded13", - "sha256": "0fmppgiz7p4kc7rvs6m73gmcbvg44z30wfs79p1dqba3wsn7xp4j" + "commit": "1faaa975c99e358165cfc3df160c21c2c611e1c3", + "sha256": "0wg1biic9sfsdhq1x1hkcbr396vkklhzz2f6an22amk2jc1pmfnn" } }, { @@ -102586,15 +102806,15 @@ "repo": "ericbmerritt/projmake-mode", "unstable": { "version": [ - 20161031, - 1715 + 20241228, + 1643 ], "deps": [ "dash", "indicators" ], - "commit": "a897701f7e8f8cc11459ed44eb0e454db2a460c1", - "sha256": "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb" + "commit": "93e2a23f929d69ac3d735a05d6bdcd93fca32471", + "sha256": "0z5nbbwis749gdsfz7fqzahhr4dx3jxavnnww06pvbyj7g5k3zwk" } }, { @@ -102813,10 +103033,10 @@ "stable": { "version": [ 29, - 0 + 2 ], - "commit": "2d4414f384dc499af113b5991ce3eaa9df6dd931", - "sha256": "0hrd4xm94nn4kazf86ca5wrmca4ss02m262zvm21i1dwq8pmmppf" + "commit": "233098326bc268fc03b28725c941519fc77703e6", + "sha256": "0jz2cssbgm895cykv8c76sby9q9g6r0ddgv86n7ss95lp67n0afc" } }, { @@ -103381,11 +103601,11 @@ "repo": "smoeding/puppet-ts-mode", "unstable": { "version": [ - 20241129, - 1040 + 20250102, + 1219 ], - "commit": "5dbce9c6785af03d47561329d38c436f0e18e3f3", - "sha256": "1zybz6ikz4i03glc4p659jr5n9i9cxb6yaamnsyavlq8lrjdbhkd" + "commit": "e9e40ebfdf61b18bba5986c1ccd33266fce4aaa0", + "sha256": "081fszyimxh2r001lzyhwvfppfwsi3p6sk8ab374l8ajp9lin2q1" } }, { @@ -103396,11 +103616,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20240930, - 737 + 20241210, + 1117 ], - "commit": "d187b3d4bbb4d9cb36a4c6c55f35d63d159a26e8", - "sha256": "1y2x1l1b1vn041q7jva6qpf4bnf84wsq19nv11wl1ka1ypzqi233" + "commit": "07e4d6ecfe677d595ed3759c912c0b262d886b98", + "sha256": "12g1mrfs6b07n0w3w41w32p5n7j4h5k5g69nymh5zyxjn207nif0" } }, { @@ -103845,8 +104065,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20230606, - 42 + 20241216, + 1959 ], "deps": [ "ivy", @@ -103855,22 +104075,24 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "9957f3e70b48b6cde77e26253feddad2cd4ca0f0", - "sha256": "049nvi9m2jsg56fc8a64ipky66yp5gmc7fq7i3lyl91h7c1lbcv8" + "commit": "3f1ce4efd1c34b9fc347c848eb4426bfcc851118", + "sha256": "0238s7dzrr0g19arah8b385bad5q1vz155f599pgwilj8cpqz7dz" }, "stable": { "version": [ 0, - 5, - 1 + 6, + 3 ], "deps": [ "ivy", "nav-flash", + "tree-sitter", + "tree-sitter-langs", "uci-mode" ], - "commit": "cd06faecb40774fafa69d91085206810d686367a", - "sha256": "15hs87ly3gr8qcdfpsyyf8wadyhhij72kkj33hdqbbq9b74yr6qq" + "commit": "3f1ce4efd1c34b9fc347c848eb4426bfcc851118", + "sha256": "0238s7dzrr0g19arah8b385bad5q1vz155f599pgwilj8cpqz7dz" } }, { @@ -104517,16 +104739,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20230117, - 1408 + 20241230, + 943 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "744924e7468200f3e8ac7ad60a496ad9d080308e", - "sha256": "127ddg5i31v40calvnd9r4d48my34wnaanaii70mr5jh1w6gw13v" + "commit": "122cc32c1e4c312b0c793788aca03eb20cdebc91", + "sha256": "01y9ac0c2qf0x6a8qwdxbsz7a8vfkjg7pmigbj5xgh06icfisi3z" }, "stable": { "version": [ @@ -104842,15 +105064,15 @@ "repo": "quelpa/quelpa-leaf", "unstable": { "version": [ - 20240101, - 835 + 20250101, + 904 ], "deps": [ "leaf", "quelpa" ], - "commit": "162ae6bc91cfe26f0b013c1b6ce83c3fe3fb8463", - "sha256": "1wlpgwvszvn1rbh8v33djin9j213mryjm752hk3khp0k2pmsvnlb" + "commit": "e800fc73c3aa0a2a4bfe9552a5d45f34e4d98cd3", + "sha256": "1jzv1xxf7yg12pckq23x0x0rqg0ngq5dhpqw6xmqshcngsnzxvqa" }, "stable": { "version": [ @@ -104951,11 +105173,11 @@ "repo": "jamescherti/quick-sdcv.el", "unstable": { "version": [ - 20241130, - 2051 + 20241202, + 2303 ], - "commit": "1f0a38c8de2ddea93f2e42b2201c8d642f300008", - "sha256": "0m14vzs4ds3f1d2gq1gc10sgcas67nq76w5a5qx1mfzknv54h3zn" + "commit": "7209fba2175cccf67827487e9399538396939a82", + "sha256": "1qw46y6fx7bgg33qqjhi6xis77r2ld33dn3yxdf9fk9vg55phcjc" }, "stable": { "version": [ @@ -105192,11 +105414,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20241129, - 1353 + 20250103, + 1921 ], - "commit": "986c9ad883a1b96076a0da6ae75761c75baaac09", - "sha256": "1952y4xjyfxw7m748lbcfkjyf0199ziskycmmqnbivqj2cv7c8wc" + "commit": "571f8266d3ac4e0a4c6684e0da642fdcd649b6ef", + "sha256": "1amy3svp3wpj6cadshn1gyh3a34vfbxls8r8amjvqnd94p25kbad" } }, { @@ -105932,20 +106154,20 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20241004, - 1537 + 20241229, + 1720 ], - "commit": "4b11f29afbd146b07203af1128cab6012bda4057", - "sha256": "0n46j7hzwqgip51c55w75s4lx5xh3z7nwaqh9p7l77icws6h9zig" + "commit": "ecd1a42fa02bac4080a7605f4d2243603a2c30fa", + "sha256": "19v9a4x18ayqa1m81zcc23bywz74pd2qsqhvcvwrgrpil1mrrp91" }, "stable": { "version": [ 0, - 24, + 25, 1 ], - "commit": "08a360e8d4f643c7115bf29c775a1d4b846c7394", - "sha256": "00fpjkgldskf5dsk64gnpz0ijfs9fcvway2rsa31rahzkbjij3cn" + "commit": "ecd1a42fa02bac4080a7605f4d2243603a2c30fa", + "sha256": "19v9a4x18ayqa1m81zcc23bywz74pd2qsqhvcvwrgrpil1mrrp91" } }, { @@ -106361,11 +106583,11 @@ "repo": "svaante/recall", "unstable": { "version": [ - 20241201, - 2002 + 20241226, + 1135 ], - "commit": "1921316d8ab02c735454b0d51153f1a657430bff", - "sha256": "001dgrdfmy3n2qyv7ai84129j463a62yqkdzcpar62iil0sq7n58" + "commit": "37da3dc6db4f734f76a6f1a2965da59030cd63df", + "sha256": "04add4kx78jslpa24fx1aq88dw57qfih00mazi0v1k6h8msarlin" } }, { @@ -106455,11 +106677,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20240616, - 2345 + 20241208, + 454 ], - "commit": "7a5c4c86cdbf8ba6b045d5ace466e5dcb2f10db0", - "sha256": "0j9ir47ny9m0kq4da7jvmv5qf282i0imm3xwfbjyxnhmmq5nj3zv" + "commit": "42642d2e0208eae4bb2a2a886b720fc4e3491ab9", + "sha256": "0c4ps9wm994ngbq2rsr1i7zil7ywwsx7f218ws7njd07xf02ik4h" } }, { @@ -106570,14 +106792,14 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20240926, - 916 + 20250101, + 924 ], "deps": [ "compat" ], - "commit": "bf7b972b11281e2951d2b8e5523fa27daa586489", - "sha256": "1h6w78qnrnzvj4w3ffgs8vfyf10imhra7ppmj0n4y8agvpxk0969" + "commit": "8a828f00a42d397639397aa9051fc884eda688d3", + "sha256": "06hjn61wsl8xyxsn6878rvprfk54r5pbv12pkf6ijq4mz3iciz8c" }, "stable": { "version": [ @@ -106814,11 +107036,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20240906, - 1405 + 20241204, + 1051 ], - "commit": "155b235f6c76f2f5790aa53798c7a7e36ce5aded", - "sha256": "0dmwm3pmmjbsvikxijf8sxa091jahgq6ybg7mn9bvgl8db6mkhyp" + "commit": "f2cb59466b1c3f85a8c960f7d4b7b7ead015bedc", + "sha256": "1k1qlf3pcvwam9qpz60lzs2f9x8dxvvvpkz70b0l3rj62zpsivdw" }, "stable": { "version": [ @@ -106906,11 +107128,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20240626, - 1101 + 20241219, + 1705 ], - "commit": "55f9d100ef67f174c55209f8d4cef1962a9adfc2", - "sha256": "0cay4dsqrcpwml0bpsmpnx0mkprr8jj1m6a027m7dfpmhf2xlrmn" + "commit": "4c2c7a241fd257dd51f2726715cd1be022b3445a", + "sha256": "1m763isg6xxhxqpww3xw7c2ynqrgc1kcwcynzgniif6clmbmdb0h" } }, { @@ -107739,15 +107961,15 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20240226, - 37 + 20250101, + 1011 ], "deps": [ "f", "s" ], - "commit": "ef1b86f745ff2e1d13dc57f6f9fe7e0c53fe26bd", - "sha256": "18gqrfxar906h4i4gn9wwwrpzi5cmnpzgfh1qkqhyjbh7wl3d37i" + "commit": "f3b7d1edcf8534152ce205bf45d7cae2b7793263", + "sha256": "139xhkmalqfbxcqi2ci3zglrh7rzgm8azww41jfqlcgssyj7r9w0" }, "stable": { "version": [ @@ -107882,11 +108104,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20220817, - 1010 + 20241210, + 1258 ], - "commit": "2b24db8d85a1c40dbd67be195caa79c9df1e0f4b", - "sha256": "0hw8spbhdwgaaggf8vrmkpg5zdy9s71ygcj8rlp4acw7cfcp6sbx" + "commit": "2a297e3e533cd1f9aac85b77a0c549ec36af5ae3", + "sha256": "14m7a7ryh34slm2x860ncg6d7ma5xdyvzs79fk92wsid4q0jl9qz" } }, { @@ -107951,15 +108173,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20241112, - 1353 + 20241221, + 1420 ], "deps": [ "transient", "wgrep" ], - "commit": "bd63cd3346fcabab0ff25e841e9d1ee56f5db705", - "sha256": "0j3vqnis4wgg9bf5b85xl9f3yrjyz1r5i64yc7ijfiin0cw8rgff" + "commit": "50d42b1395d6381fef66ff8aae4b0d171f7e5b36", + "sha256": "1l293zd0rbd5yh0v0r6raq7nqnx5r4j63q2pd7a7s1rcg02w1ywh" }, "stable": { "version": [ @@ -108194,8 +108416,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20241106, - 2056 + 20241211, + 808 ], "deps": [ "cl-lib", @@ -108203,8 +108425,8 @@ "popup", "posframe" ], - "commit": "8837e4b86d3cef73079a3f4ad6d3c79885236aa5", - "sha256": "1s5hx4gp0g66mnjwvmb1f8g9r5m3frzhxj0qphky0mssbd62dh60" + "commit": "80f09ed36d9f0ca7ce4e1a3ca1020dc4c80ba335", + "sha256": "0cgmj0j1kwjxx6077sb3b7hzj1xg6ppynyizs8v0h1x8jbngdrq0" }, "stable": { "version": [ @@ -108409,11 +108631,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20241030, - 607 + 20241229, + 1855 ], - "commit": "c152a1c591108a5244026a7e193f053a8e58e135", - "sha256": "18mwmcm6d4ii91kyjcmynwypi0ksw7ww16am9pyzlnvlv1clmy9v" + "commit": "38f83b717cf5d5c4ee105c140f4f2341b3d2032b", + "sha256": "02bxccg34dc893hnbw1j9fybkqmlkknp8c3zk959bg643x5ycrvd" } }, { @@ -108424,14 +108646,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20240509, - 155 + 20241226, + 520 ], "deps": [ "inf-ruby" ], - "commit": "6bc8a07fc483407971de0966d367a11006b3ab80", - "sha256": "144cdg0wp53g4rsmr5ps4r9fhqr686qvikf2pcyi0idyx7dcsaij" + "commit": "175d97f6321f9247d2831df9119f3bf376f5b572", + "sha256": "1f0scs63crz440v5j1hykxjs1jy7r08lmxng5p7m9wrgbl7bcjsj" }, "stable": { "version": [ @@ -108541,26 +108763,26 @@ "repo": "stevenremot/roguel-ike", "unstable": { "version": [ - 20240924, - 1706 + 20241228, + 929 ], "deps": [ "popup" ], - "commit": "4f3fe2bce0394f7f00201410d15c72847bd35b2e", - "sha256": "19rdmx8wwkl9ivbnykbmib6qj9grrblhrsrnibynb1ih0gzs6z2s" + "commit": "e2e0c089129353f0d4c08b42baf6dc9d66a05175", + "sha256": "02yq2qy17gafkayzxfvf9nwm950cw54hlqgzc4mjb21al75rfyrn" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "popup" ], - "commit": "4f3fe2bce0394f7f00201410d15c72847bd35b2e", - "sha256": "19rdmx8wwkl9ivbnykbmib6qj9grrblhrsrnibynb1ih0gzs6z2s" + "commit": "e2e0c089129353f0d4c08b42baf6dc9d66a05175", + "sha256": "02yq2qy17gafkayzxfvf9nwm950cw54hlqgzc4mjb21al75rfyrn" } }, { @@ -108646,10 +108868,10 @@ }, { "ename": "ropgadget", - "commit": "a780acaae76a8515bf0fa70c4b3ef2be0f724ab2", - "sha256": "181gqggha3zf469z2rzfvl7ngsszl984f1b8vabiqw4983ig06jr", + "commit": "30b240738501d41187b006199845e0277b5754b5", + "sha256": "0ym5rly5xvszq4ngr8mlx08k8293b7xhm660kfgha5rlvmmlxrhj", "fetcher": "github", - "repo": "Dragoncraft89/ropgadget-el", + "repo": "yvie-k/ropgadget-el", "unstable": { "version": [ 20230107, @@ -108719,17 +108941,25 @@ }, { "ename": "rpm-spec-mode", - "commit": "bb7e188fffda3d4e42690511775e5e32a11e1b34", - "sha256": "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182", + "commit": "08bb83cba3a1ce2e2c13ea1ba408aa147e31abb4", + "sha256": "0mh5mjaqpyhfcmqb7379pxwf6fzwgs4zrcgk9lbiz1pg5x5cxf67", "fetcher": "github", - "repo": "stigbjorlykke/rpm-spec-mode", + "repo": "Thaodan/rpm-spec-mode", "unstable": { "version": [ - 20160710, - 1136 + 20241209, + 2001 ], - "commit": "c1c38050c48ea330c7cea632b8785d66daeefb2b", - "sha256": "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch" + "commit": "283d2aac4ede343586a1fb9e9d2a5917f34809a1", + "sha256": "160kkf4jswlnv0prwxws2l93cq7b1x21kkkrics0cg7kfkkyrvrr" + }, + "stable": { + "version": [ + 0, + 16 + ], + "commit": "7d06d19a31e888b932da6c8202ff2c73f42703a1", + "sha256": "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv" } }, { @@ -108801,8 +109031,8 @@ }, { "ename": "rtags", - "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", - "sha256": "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "0al6p5ixbnw1xd43k1abcj427fcg2jbkdvml18b8v4vadxn1rqni", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -108824,8 +109054,8 @@ }, { "ename": "rtags-xref", - "commit": "258a113cb0f7902ca083c931c064c093b3721b52", - "sha256": "1hwzv2b6g05n6msxs88ylvvq4l503vsscxg0sxnyigpxgw681znh", + "commit": "8f5d42452235ee9f1590fa8893c4ea3d40ac891b", + "sha256": "0a7mxazfs5203h6rara65i71zinvxhnavw60z3jik5i5534ipklw", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -109027,11 +109257,20 @@ "repo": "Lindydancer/ruby-extra-highlight", "unstable": { "version": [ - 20171106, - 1933 + 20250103, + 1518 ], - "commit": "83942d18eae361998d24c1c523b308eea821f048", - "sha256": "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp" + "commit": "d1f6d41e5c2fc4cc7a23f4e79fa3710fdc74ec61", + "sha256": "08vrssc30yhyagddajnl4cyc6ar4cldbihq4fr1n0yc8asw1cyfb" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "d1f6d41e5c2fc4cc7a23f4e79fa3710fdc74ec61", + "sha256": "08vrssc30yhyagddajnl4cyc6ar4cldbihq4fr1n0yc8asw1cyfb" } }, { @@ -109180,20 +109419,20 @@ }, { "ename": "ruff-format", - "commit": "e0b516fcfb447d0cadcf90cd748b6cedba57000e", - "sha256": "077inhas0v7bcla08hsq7v08fmsgrfrz4cg1ii8n0h48nrq6anfk", + "commit": "8c8ac06cb999a353b1f168dbec17bb85b7a3daf9", + "sha256": "0snmzzi2rfyf1nfjw7lhycnph96gf0jsr6sj3gsl9kar64fza8a5", "fetcher": "github", - "repo": "scop/emacs-ruff-format", + "repo": "JoshHayes/emacs-ruff-format", "unstable": { "version": [ - 20231117, - 2220 + 20241230, + 1856 ], "deps": [ "reformatter" ], - "commit": "af6bd49b48cd1583b05268b7d2efc1c7e1c6a113", - "sha256": "1d7p22rgrmi88jrw3g7ry6h3xdabkcfnchk8x5af12pgqpfh2r2x" + "commit": "063a5e703b070103f405a4cb090af47396cfb00b", + "sha256": "0sqy3z6j9ha5i9a06kkw22jv7yf6hgp4dg7ldnhnd692jzfyf0q9" } }, { @@ -109285,8 +109524,8 @@ }, { "ename": "run-command-recipes", - "commit": "a0c6900d9bf9a3d203e8ab54e30a9b7090b7d47b", - "sha256": "1k60s1p82n03g17i01r2jj4r5rrv2y9r55m2da1bsc0wh1v8gj0q", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "099blr0dhc1nil5bff954fdkl691qh533b6504ybr2xbdy1sphgb", "fetcher": "github", "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { @@ -109356,6 +109595,30 @@ "sha256": "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6" } }, + { + "ename": "russian-calendar", + "commit": "bc6756c5d0869b4cbd7f4a1d84f0a41bcbb81963", + "sha256": "1bsy9bmq5n9akrvgsq6xyk76z8kkvjix2yak4kd30x2i31a8mcrd", + "fetcher": "codeberg", + "repo": "Anoncheg/emacs-russian-calendar", + "unstable": { + "version": [ + 20250103, + 307 + ], + "commit": "dc5c6db3ab1658d140188609f5e0ecb53bf840a9", + "sha256": "1ndxmq4isi3h10fiqbamkrcq8cf73av5bylf3b5wnbyac7hhpipp" + }, + "stable": { + "version": [ + 0, + 0, + 8 + ], + "commit": "984f568abcbfa29ec13119c8eb13da365a502327", + "sha256": "0dkw1m3gvsl8fw9adqgdbc179xjbqn8r2q9mhsvsjm6z0dqc05m2" + } + }, { "ename": "russian-holidays", "commit": "d4830900e371e7036225ea434c52204f4d2481a7", @@ -109387,20 +109650,20 @@ "repo": "dunmaksim/emacs-russian-techwriter-input-method", "unstable": { "version": [ - 20221229, - 822 + 20241222, + 1903 ], - "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", - "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" + "commit": "0798a620136e7cb6a33e5c2952ed658a65633f9d", + "sha256": "1vm8a5w1kppi9zcq4gq1jqafkxq1lcvf9rd89fj0xda86ch79y4q" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", - "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" + "commit": "0798a620136e7cb6a33e5c2952ed658a65633f9d", + "sha256": "1vm8a5w1kppi9zcq4gq1jqafkxq1lcvf9rd89fj0xda86ch79y4q" } }, { @@ -110068,25 +110331,25 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240926, - 924 + 20250102, + 957 ], "deps": [ "compat" ], - "commit": "2dc2457650d56d7b495a3db1926acdfb57ad430a", - "sha256": "0skrrz57k9d9j82d1cxs7hvh3jrw2qnim6ks7bzfjwgk8lvl82rc" + "commit": "7f5b0e34885346a18b381ac0dc457e0f347a7187", + "sha256": "1l50fd0fr66ws4i071kfzm28jscw3gcl9ss1nf2z97d052p457lj" }, "stable": { "version": [ - 94, + 95, 0 ], "deps": [ "compat" ], - "commit": "3c32b141f083c31539bb24700eb0aa23ea55918c", - "sha256": "1fgnvshyyxyhp4qxc29iqdzvdg2cj2d94lbgsii2bby3k18fzqxc" + "commit": "8bc0bbb7ab770ec81d7ce460984a000bf7a3c112", + "sha256": "1m71n6kx6fg5hprk1zry3is1hg32bmhh476960lygxp195hkx9y8" } }, { @@ -110115,11 +110378,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20240729, - 420 + 20241231, + 839 ], - "commit": "bd0638c32ab0f2eadacf2809329abf5388211760", - "sha256": "1cn16cgh51am3skd081xz2di6fybn4c589f0g3qi5w73c5fmzq1d" + "commit": "661337d8aa0a0cb418184c83757661603de3b2e3", + "sha256": "1nmbgs0ibg1rq8s47f7znp3njcpmvcifkln800ph3hqpyf9lj33z" }, "stable": { "version": [ @@ -110184,11 +110447,11 @@ "repo": "ashinn/scheme-complete", "unstable": { "version": [ - 20201112, - 442 + 20241205, + 111 ], - "commit": "b9a1448c4696f117d9ea4e59b6162dc31112e71a", - "sha256": "1smxr5bkzbfrjx21vhrj1wagmqx5yd92i997dbgs16iaqbzzr7cz" + "commit": "569277c0caa3edf8b28086b0efca6db4186184a8", + "sha256": "10k3pcsn4ic3jii6dgv1g7271ikc4d9js898wsgkph2phdyg60rl" } }, { @@ -110434,11 +110697,11 @@ "repo": "zk-phi/scratch-palette", "unstable": { "version": [ - 20240516, - 1817 + 20250104, + 1359 ], - "commit": "6b344af6b33b6b0bfd08e213dd0d43b714f7a5e9", - "sha256": "0a09lxfj49m1x894byqb6bgcbckiasaxka5r6g2n4rmk7hpj1rmq" + "commit": "e4389fbb97f2890c4caebba0588cbc5d5f1ecbc6", + "sha256": "1l7n05b605mzry6lg3cgxipis94b86fy0ajxh5qa0jxbbajrgb6s" } }, { @@ -110638,8 +110901,8 @@ "url": "https://repo.or.cz/sdcv.el.git", "unstable": { "version": [ - 20220210, - 1412 + 20241227, + 319 ], "deps": [ "cl-lib", @@ -110647,8 +110910,8 @@ "pos-tip", "showtip" ], - "commit": "98e239c7380c63282845d5bc55ea6d605f5a33b8", - "sha256": "17jxnc8z2a5rdfrjxw6gfkijp06jkjpsvj0pyxrhmg94gimfprxa" + "commit": "941ac2fbbb1be9ad595aed6dd782a842c4676a1a", + "sha256": "13z0ql5h0rd7saf9ibfmpqymf0nflshxs81j7f16wqc3pxcafv7k" } }, { @@ -110729,15 +110992,15 @@ "repo": "jcs-elpa/searcher", "unstable": { "version": [ - 20240101, - 938 + 20250101, + 1011 ], "deps": [ "dash", "f" ], - "commit": "b2b62cb49312725b05d133c2e155b00d885dc8f5", - "sha256": "0irpy5sfy5mdxqjrgiy8qiq283gvqrl80bb4xk9k9qb4rfc60gz1" + "commit": "12008a7a9e03980e86cfa6d9589665c70ec0ad4d", + "sha256": "0rw9rnaspj11ccrxnih50gy8a6gzn2sbq4lnx31kn68v7qp7j07f" }, "stable": { "version": [ @@ -110980,6 +111243,30 @@ "sha256": "14i8h50n49mw9960vlsahzf1rbn1mj9400gapil9id9q2xysdpmd" } }, + { + "ename": "selected-window-contrast", + "commit": "ab4404f1470718f4ce8e7ef32c4b5ae5058d317d", + "sha256": "0wbgjzw46vk093rqhn9pzqlhabagcmgj973zwf1dhkwl5xpjhyms", + "fetcher": "codeberg", + "repo": "Anoncheg/selected-window-contrast", + "unstable": { + "version": [ + 20241226, + 953 + ], + "commit": "41003daf4b17f9cc38f24b834e8e26668760f2da", + "sha256": "1p7asx9y8ixa8a8jv3ncymf8llz7fnj6ib0pbb7znpw35fjh96pb" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "commit": "078242b001fe0799200932c41c08e48f8b19ab7d", + "sha256": "0ksabq4mi1hppshjkka6yr2h11aq514zgq6v6k5vbyrw0i90ywgi" + } + }, { "ename": "selectric-mode", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -111896,20 +112183,20 @@ "repo": "xenodium/shell-maker", "unstable": { "version": [ - 20241128, - 934 + 20241226, + 2102 ], - "commit": "d9330f283241142a13a11d5d83aca875c6796f88", - "sha256": "15v3hlcasfv6jzabhg9753hg0jhwfbjycsq75qg2q9vcf0ksacm6" + "commit": "72ce76bb3059e6c715b2471856851aac21198ac7", + "sha256": "0df0mxaz2g4fzdlhxygifmsjnxw7n8v1ghz1pnlhad0anpwdsdv9" }, "stable": { "version": [ 0, - 72, - 1 + 76, + 2 ], - "commit": "d9330f283241142a13a11d5d83aca875c6796f88", - "sha256": "15v3hlcasfv6jzabhg9753hg0jhwfbjycsq75qg2q9vcf0ksacm6" + "commit": "72ce76bb3059e6c715b2471856851aac21198ac7", + "sha256": "0df0mxaz2g4fzdlhxygifmsjnxw7n8v1ghz1pnlhad0anpwdsdv9" } }, { @@ -111920,14 +112207,11 @@ "repo": "kyagi/shell-pop-el", "unstable": { "version": [ - 20231228, - 612 + 20241207, + 1539 ], - "deps": [ - "cl-lib" - ], - "commit": "ff3dc705ee1c7bc566b35c17e4635c57061fe3ae", - "sha256": "0awhya3v78k5jkhprifd44aycgv2d40hnmldfw4g7cvljvxzclal" + "commit": "657171f296fc930b1f335a96e6f67ae04b731b19", + "sha256": "1j8bwgrp4ydpd4s08px15sv5ri28zyb8zfpmfanh9k77m4hmx8cq" }, "stable": { "version": [ @@ -111972,20 +112256,20 @@ "repo": "DamienCassou/shell-switcher", "unstable": { "version": [ - 20210509, - 1045 + 20241229, + 1657 ], - "commit": "ed74b20fa12935be0068765f5bc8de97b92a8020", - "sha256": "18ynh2j3mq206lqgkd7zmxzxh3661w9nbawkwvgkk2qi3837xrbr" + "commit": "4c96dc27afb519bdbf7bbe42d49a51497f078192", + "sha256": "0py95c6i7bffidwkwld1j1h2isyq7psna2kz81jigzz0wi885pjr" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "2c5575ae859a82041a4bacd1793b844bfc24c34f", - "sha256": "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria" + "commit": "4c96dc27afb519bdbf7bbe42d49a51497f078192", + "sha256": "0py95c6i7bffidwkwld1j1h2isyq7psna2kz81jigzz0wi885pjr" } }, { @@ -112232,11 +112516,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20240827, - 234 + 20241225, + 152 ], - "commit": "5c9652141ac2eb8ad9bf68d74f760db526095ec4", - "sha256": "0dplbgq1n7mgnmn3wzfbkrpskdc71fh5bgqd9cplp0ax9ghcdynh" + "commit": "9712e5703cb846b3cff448d5c40b3f8c7e6eedde", + "sha256": "1yk3nbgirjv54kkw720x28vq8jr2f2vba096sqn3s2xxvxy2d1jx" } }, { @@ -112323,11 +112607,11 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20240101, - 931 + 20250101, + 1011 ], - "commit": "febc1df7ac1c7006b3f0993a3436575e8e0dc71d", - "sha256": "0lqnh43gbh3aipl6mk07cxpqsylh5bs3gzcr18r4xmdnxvg3q3x4" + "commit": "117060c077dca1facb7ea8942ea866d0621ef5ce", + "sha256": "1vhkdkww38fxaqiynm2l0f1nqmhxw074a9qfk3yi9vfrn6r8k2q6" }, "stable": { "version": [ @@ -112716,14 +113000,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20241130, - 1105 + 20250101, + 856 ], "deps": [ "ht" ], - "commit": "63c913aeb5836f2376d1ad01580e67f9d1c56e0a", - "sha256": "11agf4mzydyksbh869s1rq7z2vi4jk4w0mkbs9xqw69lnasr2iyx" + "commit": "709095ca022dd4ea4ceeb6ab18ce9b9dbda0d6a5", + "sha256": "01ccmmnizi2wakkb92zp922idcfsmmcspac1shf7lxjqfbbrpr0n" }, "stable": { "version": [ @@ -112746,15 +113030,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20241130, - 1118 + 20250101, + 857 ], "deps": [ "sideline", "vc-msg" ], - "commit": "24acacc766f7cc8ffb1a7dda695be6eb67ec5670", - "sha256": "18gvg5b89g88ijhx058lvdnwvwgm0jpkg6cnrrf86dj2sv2qzdcd" + "commit": "872c232b7f5d3805bde24607bd0050fc9464f8d6", + "sha256": "1815l3i4acwhfyf0hdna9fg32jmkzk34b336viiswpmi00h1j4nb" }, "stable": { "version": [ @@ -112778,16 +113062,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20241130, - 1119 + 20250101, + 857 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "1cc46a244d76027687136b3db0da1f5535d1352c", - "sha256": "0q16mblknwlvs9adg8vc919snr7m3qypz8xj2vbn2vf6m8prs0d3" + "commit": "bce7bbc90edc3cdeb3144a8fb8d59f5529e3391b", + "sha256": "0mfznzv254rdam67vsdq7nbhiq97cilccbgh14ckq5f2v10sfpil" }, "stable": { "version": [ @@ -112811,14 +113095,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20241130, - 1119 + 20250101, + 857 ], "deps": [ "sideline" ], - "commit": "096b2fecfdb5a2192541e6099f761dde22b53aec", - "sha256": "0z8h403891swpprjfj5pvpnh129p9kmsn0hb7625k7iar6xnywc2" + "commit": "c3099660040fb360f4c02a74e50612aefdfe7999", + "sha256": "07882x0mxc95liqql873yil4s3cmv6hvf8aswxj3qq0kz0l9bv76" }, "stable": { "version": [ @@ -112841,8 +113125,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20241130, - 1119 + 20250101, + 857 ], "deps": [ "dash", @@ -112851,8 +113135,8 @@ "s", "sideline" ], - "commit": "96fd13fa94fc7abfe84dbf1c966cdfe1b5273d94", - "sha256": "19jrhyyzsrc6vwj3kbpc9vh1wnyj81w46skk59dm91ws0isyvf6b" + "commit": "29b95888a91f53e5161a3f2e2fc27a9cfc71ebe5", + "sha256": "0dzfff4wxwpas76cc6rhi152w875j89qiw7fvz8adqdkqbcji306" }, "stable": { "version": [ @@ -113133,11 +113417,11 @@ "repo": "wachikun/simple-screen", "unstable": { "version": [ - 20240127, - 214 + 20241228, + 113 ], - "commit": "1c5d025dd267ec7b0c8f210a27b2b8f8e11fc07b", - "sha256": "1lnhfc8axggc0z6jz6d1l0dm5f9mkszg5wzh5nn8z0690mmj97vx" + "commit": "66eb5ddab259025ef5790084ca33018c266d6940", + "sha256": "1wx509s8zhn2rvxff3197dai5a6giydqfwqknrl5dzaq7l1kf5hv" } }, { @@ -113310,11 +113594,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20241125, - 217 + 20241229, + 1843 ], - "commit": "d55ea5c0271c9fb91cd1eeceadeb20f67b7cf5fb", - "sha256": "05c1fhvp29v76151l4pv1qkbxjlqkz4k60ps2yn2zlgmpygpzzkg" + "commit": "fa12ae71e96dc3eb620db301c7e16ea1d15cc4c9", + "sha256": "1s9irjww9dsd7la81nsczxarp44y3v75axg912337w2pzj569bj1" } }, { @@ -113325,8 +113609,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20241015, - 1351 + 20250101, + 1807 ], "deps": [ "compat", @@ -113334,14 +113618,14 @@ "llama", "magit" ], - "commit": "e6ec5d8687f34644b4d049a6be463269792c9fd6", - "sha256": "0kgx57liqqfdslxpzm7av1jj5yjpjbabdiijc95jqw47mvvnfj1b" + "commit": "b5303108fcccca495fe36202d023a068ee7af2f7", + "sha256": "1kc91jicm5xmlchcnvx2mpalqglzxmxkwbvs1kfvkgvkgh5z8d1y" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "compat", @@ -113349,8 +113633,8 @@ "llama", "magit" ], - "commit": "e6ec5d8687f34644b4d049a6be463269792c9fd6", - "sha256": "0kgx57liqqfdslxpzm7av1jj5yjpjbabdiijc95jqw47mvvnfj1b" + "commit": "b5303108fcccca495fe36202d023a068ee7af2f7", + "sha256": "1kc91jicm5xmlchcnvx2mpalqglzxmxkwbvs1kfvkgvkgh5z8d1y" } }, { @@ -113578,22 +113862,21 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20241126, - 6 + 20241226, + 2336 ], "deps": [ "alert", "circe", "dash", "emojify", - "oauth2", "request", "s", "ts", "websocket" ], - "commit": "661041b5c398a1e7c226b2805aaffd4387ec3e94", - "sha256": "0h66mb4mfdrwmbsxr5yfsqv580ipyqq0gyzfyz0cw11qwpxnq0x0" + "commit": "ea3b1a30dc349df33288eb4eefbbd3a5ee28a9ae", + "sha256": "107d4kxj2r62k5p0rdy9dz78qrn104rrmz6ig1983dxjq7sxxfkn" } }, { @@ -113654,14 +113937,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20241201, - 2103 + 20250101, + 459 ], "deps": [ "macrostep" ], - "commit": "a71e133aa7d3c132bb3a00cedaeee3f76b5f17ab", - "sha256": "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi" + "commit": "af6f1fca2f45c151f830f42905d6fc0f66053798", + "sha256": "0wxxlcik32cggjr591ksvxcrsbwalf1bcysjj5yal8jw0b8k7fi1" }, "stable": { "version": [ @@ -114147,11 +114430,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20240129, - 1813 + 20250101, + 2011 ], - "commit": "04481dd62671a557fa8812c336d23108e2bca2fa", - "sha256": "0xhzf1ya1hf5xfswnlz2anfcp9j38yxkwvd1wf05vf68x849n25y" + "commit": "98ea891a885fbe54a754a46730be3527dfe24af3", + "sha256": "02fwz0jpri18rajf752nk729wx3mxrhrkf76rbk623bm9sfcw0g0" } }, { @@ -114284,14 +114567,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20240103, - 927 + 20250103, + 1324 ], "deps": [ "smart-mode-line" ], - "commit": "f422b79e7b6e2796b1d5f4143913497383840960", - "sha256": "1f9003m0wkw2j6b9k1i0ahr4cdslx48rhk8ggksn30523gssa1xp" + "commit": "318865f15d33c480216221baff4d1ef85e07552d", + "sha256": "1ds4zi45vplnhgfyk0qi3a8j2n8y47kns32cgglxx7m5h7h893hl" } }, { @@ -114463,15 +114746,14 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20240713, - 1002 + 20241220, + 1254 ], "deps": [ - "cl-lib", "dash" ], - "commit": "c7519a1b69f196050a13e2230b7532893b077086", - "sha256": "06bdr3vcywg6k89d5dmvj4sdxh95y0jgh5xlddvmv2x0i8d7g69b" + "commit": "b0d935c11813bcd40f8d35bae8800e0741334c29", + "sha256": "1j3x0bwvgymgaxi6clasr00gwsh7vwbhysfabqxynb044m1kccq6" }, "stable": { "version": [ @@ -114914,16 +115196,16 @@ "repo": "danielfm/smudge", "unstable": { "version": [ - 20240413, - 2104 + 20250101, + 2103 ], "deps": [ "oauth2", "request", "simple-httpd" ], - "commit": "4a9c5b34e9bc0a694d0faf8c2f83dc244b8b6a2f", - "sha256": "1xiqxw87sdk9mgy7fdbmzqaf58dc1grhkigirg1bd0b2q5kbnbwx" + "commit": "5768ea8048b906bfa6ae942ecd4f533a9a55e8c5", + "sha256": "1j4p088kzhsdil4svimhcp02xb09islr7zzk5qy35dxa1ak2pv8r" } }, { @@ -115997,11 +116279,11 @@ "repo": "gnuhack/spanish-holidays", "unstable": { "version": [ - 20240302, - 1542 + 20241209, + 1141 ], - "commit": "81ef3733da0ab807570c7fad1bab613bf7f30acb", - "sha256": "1d2hg6r4zc77xrmid7kz4w91g5ib13hl5kl8ak1w5glb51mfhfbw" + "commit": "a596ec68f26c06063718dc83132e2843107cfe5c", + "sha256": "1py204463crsjn0qjpz79ngyhk78la0wrhn03xmhb8nlpqmpv64q" } }, { @@ -116102,11 +116384,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20241117, - 126 + 20241220, + 119 ], - "commit": "c036cfc6e6581b1c23d484d278e278c4d809fc23", - "sha256": "1isgv9fzdfgf2dn7nv5wypkm2g4yh508qxh1npgbfgwg38shpq1c" + "commit": "050971f33487a676bff4b21c82864dba7cf3b6eb", + "sha256": "03prllb4z2izv0wcb814cm78wzi36iw6rrg1bi0gpsbr3ya4axqh" } }, { @@ -116144,11 +116426,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20240513, - 1716 + 20250104, + 1435 ], - "commit": "ac7497e394bf7d46e0b2c27570f5507f6a50a157", - "sha256": "1y8r75sl28kll8r6qzqnbri18j2kgvqfh73yi9kszld5zz8d95mp" + "commit": "4dc3e407509e18c383a21b6a2368a27c7dbb354a", + "sha256": "1qvrd8w5lx3kgjb3jdnkvhgfi4wpx0d1l526slgrz3nrqi3f7dp3" }, "stable": { "version": [ @@ -116877,11 +117159,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20241121, - 1857 + 20241230, + 338 ], - "commit": "e9f6edb09d9cce461249ad54505911d71ca81a45", - "sha256": "0hkri3rmyj303lhi4wr6ydc3b553lczra6al9n5i9mcvx2i43gx8" + "commit": "9e667e59946c47a78cca88bf708efbe88ccc4a9e", + "sha256": "1fqzw7lqh3zrilxmdcsnfn0pbq9wqrjpmmkjsx4al688s31pbhan" }, "stable": { "version": [ @@ -116994,11 +117276,11 @@ "repo": "peterhoeg/ssh-config-mode-el", "unstable": { "version": [ - 20240901, - 2018 + 20250101, + 820 ], - "commit": "2d8e321c34a7535ae6dd0f6a1b0fd54e47aba612", - "sha256": "0l5k7g4cq4ay7c5q961562naqq55732q3b2qjgg32800qzrid3kc" + "commit": "d0596f5fbeab3d2c3c30eb83527316403bc5b2f7", + "sha256": "1xs9ixp2bgbn2whjpj7l1n15fklivfh7544sgai61225jprckyak" } }, { @@ -117154,8 +117436,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20240731, - 347 + 20241223, + 1047 ], "deps": [ "compat", @@ -117164,8 +117446,8 @@ "s", "spinner" ], - "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3", - "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7" + "commit": "92ecc8e99a9bfaa19bf1a7581eb1d44d565c10a5", + "sha256": "1b8ms769030cnhblva31bgb4rp0h6zirmwgfgx0rh8xxzp2y0p1d" }, "stable": { "version": [ @@ -117351,20 +117633,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20240909, - 39 + 20250102, + 253 ], - "commit": "b691c04d4237394977b603867a063778668cbab3", - "sha256": "1ind7jprg1gb1zgw0phyxknacg4q1s3536hr0ha9c5jadrshpm3w" + "commit": "10db7b5131d11b6bd27fb516fa13ecd2967b50cf", + "sha256": "1lcy8sib9l551dp3f5z9akmpdq9jkndfbp8kcj917gkbhdp5a82z" }, "stable": { "version": [ 2, - 4, - 12 + 5, + 0 ], - "commit": "b691c04d4237394977b603867a063778668cbab3", - "sha256": "1ind7jprg1gb1zgw0phyxknacg4q1s3536hr0ha9c5jadrshpm3w" + "commit": "10db7b5131d11b6bd27fb516fa13ecd2967b50cf", + "sha256": "1lcy8sib9l551dp3f5z9akmpdq9jkndfbp8kcj917gkbhdp5a82z" } }, { @@ -117382,6 +117664,30 @@ "sha256": "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0" } }, + { + "ename": "sticky-scroll-mode", + "commit": "fd1261d019d372fe4baeec686441407e7f98b931", + "sha256": "1kch1kpaf1zjw6r4rgxanynrxl5im9dgip0dfp0dbr9gr2iyrqr3", + "fetcher": "github", + "repo": "jclasley/sticky-scroll-mode", + "unstable": { + "version": [ + 20241213, + 1543 + ], + "commit": "a1acf1065f88a586770d0eeddec376907d8320c6", + "sha256": "1szckrmcr49byr42qnghrivcnbwb1rnwfszwf22b5b7m0gazqhxd" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "4c8cad80f63ce23eb35c9955824b7f07812ee0fc", + "sha256": "029wxbi1zzmjh1bdbxn589gawhbmg3a7jpdh0ywwzx4006y2nagh" + } + }, { "ename": "sticky-shell", "commit": "20d69241bf221bc4ab1b9f9ea60219e305d4aa14", @@ -118127,20 +118433,18 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20230102, - 904 + 20250103, + 1003 ], - "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", - "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" + "commit": "4b63a82c3145bfff2dc1f7b45ce2463824462da0", + "sha256": "0i14py15rrnyaq4hysijff6y1c4l440y9y1xf9xba8w2sxni4wpv" }, "stable": { "version": [ - 2023, - 1, - 2 + 2025 ], - "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", - "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" + "commit": "4b63a82c3145bfff2dc1f7b45ce2463824462da0", + "sha256": "0i14py15rrnyaq4hysijff6y1c4l440y9y1xf9xba8w2sxni4wpv" } }, { @@ -118935,6 +119239,25 @@ "sha256": "0xqzn4j27xny3gmjan9phcl60zipp49p79nv57i7mpz8y0qahc59" } }, + { + "ename": "symbol-overlay-mc", + "commit": "a7a8867ce1daa4f1f9746e9903814657a6e1d175", + "sha256": "0nkbrvjxbqjlaxa5hjc1x0lxgad8kx5k7s83pgv8gb7j0b3jv606", + "fetcher": "github", + "repo": "xenodium/symbol-overlay-mc", + "unstable": { + "version": [ + 20241216, + 1436 + ], + "deps": [ + "multiple-cursors", + "symbol-overlay" + ], + "commit": "188fa07fe5cc142dbabcd2b4a102a9ec5f132839", + "sha256": "1afm3dqijdyfpkjdp7l7sfjfdiavapby4l4aa63wyz6r64ijgpv1" + } + }, { "ename": "symbolist", "commit": "967f1819c8d3a6ead5cc5bb7a577be07dabdbe5e", @@ -118999,8 +119322,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20241126, - 352 + 20250102, + 50 ], "deps": [ "evil", @@ -119013,8 +119336,8 @@ "tree-sitter", "tsc" ], - "commit": "2a5ad0113a906aca9f4adade2776706657b314bc", - "sha256": "056c5n21xq0r82nysjn7m230h85pd3z1fiz38asabcpkd5cxbbir" + "commit": "94e5040f0c24f870b7217d8ddf6675c6b17eaff4", + "sha256": "11lj9vrfiiz2my519kc54lrg5dfhk66bp34c3rg1psjr99f118zv" }, "stable": { "version": [ @@ -119100,20 +119423,20 @@ "repo": "KeyWeeUsr/emacs-syncthing", "unstable": { "version": [ - 20241126, - 247 + 20241210, + 2345 ], - "commit": "70569dd11762125205015b0e59638c6b1683f0f5", - "sha256": "11jynl1wg13vysnzl0xakwl6h3kqvjbdjcxxvc0gq2qg73iz4am1" + "commit": "5dbb9516f346c390bd9488da52cb4c4b6dda470d", + "sha256": "1q755rcmlmpz9zb1i3ic3a3svyqwavncnfzmx0bsg6229qg06d0l" }, "stable": { "version": [ 3, 0, - 0 + 1 ], - "commit": "70569dd11762125205015b0e59638c6b1683f0f5", - "sha256": "11jynl1wg13vysnzl0xakwl6h3kqvjbdjcxxvc0gq2qg73iz4am1" + "commit": "5dbb9516f346c390bd9488da52cb4c4b6dda470d", + "sha256": "1q755rcmlmpz9zb1i3ic3a3svyqwavncnfzmx0bsg6229qg06d0l" } }, { @@ -119486,20 +119809,20 @@ "repo": "jimeh/tab-bar-notch", "unstable": { "version": [ - 20231120, - 2029 + 20241224, + 109 ], - "commit": "6d1101d8156e336f45122c04889327a4c5be253c", - "sha256": "1s0j89g93jq0p2p9w1wj9aycm74iar2vg0gkhf87xxf88ldhafs7" + "commit": "49a0f4948bc3dc51ae36b026dec89698b26c0cb2", + "sha256": "1fa00yqw93h6p9q0swbnp3892zv69g4dnrzgdaqmndfk954gx9yn" }, "stable": { "version": [ 0, 0, - 6 + 7 ], - "commit": "6d1101d8156e336f45122c04889327a4c5be253c", - "sha256": "1s0j89g93jq0p2p9w1wj9aycm74iar2vg0gkhf87xxf88ldhafs7" + "commit": "49a0f4948bc3dc51ae36b026dec89698b26c0cb2", + "sha256": "1fa00yqw93h6p9q0swbnp3892zv69g4dnrzgdaqmndfk954gx9yn" } }, { @@ -119557,8 +119880,8 @@ "deps": [ "nerd-icons" ], - "commit": "e44d16276f5df80a2d2b86e5fafb132f43bfd550", - "sha256": "0plmb9m8hpini73v2z1kcpwkm5jvdikbkadp8x6p78d9wi2iss78" + "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c", + "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7" } }, { @@ -119639,11 +119962,20 @@ "repo": "isamert/tabgo.el", "unstable": { "version": [ - 20240204, - 1326 + 20250103, + 1740 ], - "commit": "83b7d3261e9a6aaffd8e97bc047b77a6131789ee", - "sha256": "09qdmdivvnwkslq124flgijvxlvix3spglmx8676fjz6gnyzd6zs" + "commit": "23b6397fd61db31689feacb4b7df2b1f64e69572", + "sha256": "13d72g9h33a8gkrw76nz6dzpalj91pp17707mqwz6zn0miyyzx9d" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "23b6397fd61db31689feacb4b7df2b1f64e69572", + "sha256": "13d72g9h33a8gkrw76nz6dzpalj91pp17707mqwz6zn0miyyzx9d" } }, { @@ -119677,8 +120009,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20241123, - 715 + 20250102, + 1608 ], "deps": [ "dash", @@ -119687,8 +120019,8 @@ "s", "transient" ], - "commit": "1f7e417eb18e097c0c08c9d151f40f476aa64608", - "sha256": "0vd43cj7fmrjig6abibz5nlag8f3m8qgdb4ncqygq81fl39f5sif" + "commit": "7c103aa9e1dd46e8507d341fee42ce30417e69f5", + "sha256": "04zkn014mjqwscc4iyjjajx98431gi31082pw1wcl4wrz2lc808y" }, "stable": { "version": [ @@ -119921,11 +120253,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20241126, - 1304 + 20241231, + 1206 ], - "commit": "fff056c76220ea87eb45ee115f3a54a1abf1273e", - "sha256": "1hn2mfafkzbv8cwz3ch83by3x9nxq6m4ymx75chg0np55l9hmdxg" + "commit": "1558c12b647d289285b638075be016f7f0c3466e", + "sha256": "0ksa9ndypkvjm00zzhd1bj163jd7v5rim4ssvnqhhsps0mdrch6l" }, "stable": { "version": [ @@ -120112,15 +120444,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20241118, - 1404 + 20241220, + 1052 ], "deps": [ "transient", "visual-fill-column" ], - "commit": "f4f957253093a449c806397fd6157e19d84a7c02", - "sha256": "1v6v813lglgwcl8kv6jrvqjyqgp4crpbkv8qyckh9bhkjbmcgxma" + "commit": "3836cff15393fe1dc1addb4fe46b11878dab4891", + "sha256": "14f3hsc6rkbb7b6z35154y9hqhgv2rmwnkl0xz18py8y8s524j77" }, "stable": { "version": [ @@ -120251,25 +120583,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20241115, - 656 + 20250101, + 927 ], "deps": [ "compat" ], - "commit": "3659036edbc332746dec556d0dec69ac4c52dcac", - "sha256": "14xw8sf5frws7qrpq4p08nphj1hflrnzlxa0bd78p6dkr86pjnij" + "commit": "12a2072ce97d7489296dbb950da946b77d215506", + "sha256": "1yjp2fk0fzvj9xsshvbha9csranqgrwhf8ggx52qmfn4shssxrn7" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "317c0e41d542721db11a7a8a1c6b78762959259b", - "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr" + "commit": "40a85c3dc9a7f073e36fb05b835814a4e68fa5b3", + "sha256": "0sh477bx437d3lz6v0m418bk1iwr3mjj8xf396qdi7kiiaic0drz" } }, { @@ -120280,14 +120612,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20241107, - 1417 + 20241229, + 1149 ], "deps": [ "tempel" ], - "commit": "85f8e1d80963bc717abb8bf160274455093e3b6f", - "sha256": "0nc23339y09r8ngx154bdcnlx1kbz1pr4l0j28nli79zcvxb4akf" + "commit": "b2fd7929bd767db9d31b2782168f91dcdc75af5b", + "sha256": "0m52k8fx88ry9ay6xs5xaq6j56rx2lykb1jgxmia26xyf4h5ykd9" } }, { @@ -120691,11 +121023,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20240227, - 2236 + 20241231, + 1234 ], - "commit": "c996304c1e873e561108a509129b9e4358d354d5", - "sha256": "0dk9wvsbx0szhn8r7ls4729fi2840ywwfir905b6dmvdxxy85q7k" + "commit": "dad595abd278a89f14e9f0231bb96ed089822245", + "sha256": "0c41ymawgipxg3y8slmsw8nh5n546xy1iyki827jrfdr3767a84h" }, "stable": { "version": [ @@ -120856,6 +121188,29 @@ "sha256": "1180kaj9cc16n2glpc04pnzbia17daxk7dawc7l1hba7mk9vq1wm" } }, + { + "ename": "terraform-docs", + "commit": "0215a9cf52a9023dccee73768cf14f507ff0e585", + "sha256": "0bg667w37bdbl6lbkl8lm2k9s1lvydl1mbya0wk1nls36dj9y7cj", + "fetcher": "github", + "repo": "loispostula/terraform-docs.el", + "unstable": { + "version": [ + 20241216, + 649 + ], + "commit": "c70d19c4007d81244b276b9d150cdfe3c2e7b8dd", + "sha256": "0ad9gv9ks7zii3s20bxlskd22hsrci2r0sa0s0zvw4k78xq90xfm" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "94a78999ec03e66ce49f7343cc8705354e195c3a", + "sha256": "0qwbazypfy75k9lbari276yw05857x529bymjyqdvqcysh2lqrmd" + } + }, { "ename": "terraform-mode", "commit": "6e881965abc08d699c4b878b2c097e51af0096f0", @@ -120864,15 +121219,15 @@ "repo": "hcl-emacs/terraform-mode", "unstable": { "version": [ - 20240801, - 921 + 20241217, + 1628 ], "deps": [ "dash", "hcl-mode" ], - "commit": "abfc10f5e313c4bb99de136a14636e9bc6df74f6", - "sha256": "0rlzx80dx1gv0hcpkjnlvabhf124l442pfish1vii1jaqm5b07ps" + "commit": "5bdd734a87f67f6574664f63eb4d02a0bc74c0d0", + "sha256": "08zvcy8kqaz5zjrmaiqn9h9msx7p937mq58374cp29hrcns0jxb5" }, "stable": { "version": [ @@ -121430,21 +121785,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20241125, - 830 + 20241229, + 2000 ], - "commit": "13a0cd43ea3f14bc58b7685dbb28bb5325c6a398", - "sha256": "126gb3z9y2jz74qx5hv4zpwlx9chhip996ihlzk7c8zcvyj86gdv" + "commit": "1b906076d75be39b1b6b5e7bcae9a43530ec0d80", + "sha256": "0apiyi0715xigyqf168kxm85jsjyy0ryqvphmmb9rm5hi510ixi9" }, "stable": { "version": [ 2024, - 11, - 25, + 12, + 30, 0 ], - "commit": "13a0cd43ea3f14bc58b7685dbb28bb5325c6a398", - "sha256": "126gb3z9y2jz74qx5hv4zpwlx9chhip996ihlzk7c8zcvyj86gdv" + "commit": "1b906076d75be39b1b6b5e7bcae9a43530ec0d80", + "sha256": "0apiyi0715xigyqf168kxm85jsjyy0ryqvphmmb9rm5hi510ixi9" } }, { @@ -122099,11 +122454,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20240421, - 1056 + 20241230, + 2209 ], - "commit": "46e0c960629c82c090f42c196876aaf4d6edff1a", - "sha256": "0bmshvrw66rhszqqgfvnpvgvjzqvwi5mlylzz4v3dhvpr32bpb3b" + "commit": "c75ae9bed8f3bb2229e873fcc85fe62701e47974", + "sha256": "0mxz9bmdcdxkj7f4ih405i4vpd35c72xgs1i8cbi0132dpnnblpz" } }, { @@ -122431,11 +122786,11 @@ "repo": "jamescherti/tomorrow-night-deepblue-theme.el", "unstable": { "version": [ - 20241128, - 1605 + 20241202, + 1540 ], - "commit": "a6f73ee3cafd580a8704f6d1a596dc19c783e31c", - "sha256": "01mfial0jh595pk6imn6z0g4r3mk15c508xnkkrsazs3614brwq8" + "commit": "44b864c94b76310fd8429dbd6b7484c7c2ac50cf", + "sha256": "1sj8a3vvl2kz9hkbfc4zk4k6qykp7ds0h7y6a8bxpqrcmna9m4c5" }, "stable": { "version": [ @@ -122710,14 +123065,14 @@ "repo": "martianh/tp.el", "unstable": { "version": [ - 20241031, - 729 + 20250103, + 1428 ], "deps": [ "transient" ], - "commit": "df6490d86f24fff22f5ea4f7d887fc60caed1163", - "sha256": "14vdn5syv7jghxvqlih9gvh82755r5gd8yxskq8bv6wkm4b0y0cs" + "commit": "32f4e7492aa041afff8190d06edbf0343c4bf6a7", + "sha256": "1q8pw5lxjl1ahr24dy7shvn03fck8wsdkffgra7xwqsa5vsl1lib" }, "stable": { "version": [ @@ -122949,6 +123304,25 @@ "sha256": "1dnh8ws788if32wqnhzqjm38zjhpm9l3sq74245djnn1mx5bm56m" } }, + { + "ename": "transform-symbol-at-point", + "commit": "082ba556ec7c2ca6091b493b0e7c220309a30107", + "sha256": "0z187ji96b1bv2gzh3cnmfv7gx01yq2x2w1bm3qj5bzydv3sp51c", + "fetcher": "github", + "repo": "waymondo/transform-symbol-at-point", + "unstable": { + "version": [ + 20241202, + 1802 + ], + "deps": [ + "s", + "transient" + ], + "commit": "57911a5065a694bf0b404bde2ebf64b8ee8f5d89", + "sha256": "1cl6w7xpfjqwh8ivimdkziyl83vkg7aib25xym7g7q6kjqfr8qnq" + } + }, { "ename": "transient", "commit": "a74629656e9a23133219a0bd805982f1497b35d7", @@ -122957,28 +123331,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20241201, - 1616 + 20250103, + 1731 ], "deps": [ "compat", "seq" ], - "commit": "37be15575a8e7618de59b6aec5a42ba5656dc36f", - "sha256": "1whz9zkzid34rz5753xxyvsxnhs24xcnbv31bvc6n8l1szdncfzi" + "commit": "000ff15942878aa1108abaa020da86ada675fea9", + "sha256": "137h1m67dyrnb9l3lm90xfwsl56ih8rc0vahw38fm6ny87sl64sd" }, "stable": { "version": [ 0, - 7, - 9 + 8, + 3 ], "deps": [ "compat", "seq" ], - "commit": "00fabc76eb3dc75f742d8d2720c44e25e5772e8f", - "sha256": "17qhj3i57i6yz28bvznimls7z1y3f4mln0axk2782jcysz7f80bl" + "commit": "000ff15942878aa1108abaa020da86ada675fea9", + "sha256": "137h1m67dyrnb9l3lm90xfwsl56ih8rc0vahw38fm6ny87sl64sd" } }, { @@ -123170,11 +123544,11 @@ "repo": "jcs-elpa/transwin", "unstable": { "version": [ - 20240126, - 720 + 20250101, + 1013 ], - "commit": "99f9296a18654cb38f2ffb8682b7532be60bec5e", - "sha256": "1h65dc50ia64q9gm8xyiljif7sjzphj6fdbc7ra4bkxj8amivy05" + "commit": "bcf4cc2e83ab771dcec43973106951c643637a91", + "sha256": "1k97zyjifk7ghpncd75h58d3rwix32i731z633hlxww85bc0d8l3" }, "stable": { "version": [ @@ -123315,8 +123689,8 @@ }, { "ename": "tree-sitter", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1r2b0v10h21xi14z4dc1k3hlw3dchf7qylsfy22ah22yzbsldc30", + "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", + "sha256": "18aqdfhqfhq4r9i3f35kqlm2nvywav62vgf1fjv8nqqj11gyamk2", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { @@ -123433,26 +123807,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20241201, - 1840 + 20241229, + 1957 ], "deps": [ "tree-sitter" ], - "commit": "c5ca30e1fa43ca1fdcb7f423ec4c97732ccb8753", - "sha256": "0cj6x17yc6j8byqvb7y0k8s2vpwzyq9myqbrj2jj5i38y7d6zcb8" + "commit": "e2ee3f66c62139f4cd4483c4d97ec34cb279df9d", + "sha256": "18yzy3xgiidrxz30fyj4wagjz55m3xh78cm7k8fqb4inir1hi7ws" }, "stable": { "version": [ 0, 12, - 238 + 245 ], "deps": [ "tree-sitter" ], - "commit": "c5ca30e1fa43ca1fdcb7f423ec4c97732ccb8753", - "sha256": "0cj6x17yc6j8byqvb7y0k8s2vpwzyq9myqbrj2jj5i38y7d6zcb8" + "commit": "e2ee3f66c62139f4cd4483c4d97ec34cb279df9d", + "sha256": "18yzy3xgiidrxz30fyj4wagjz55m3xh78cm7k8fqb4inir1hi7ws" } }, { @@ -123529,8 +123903,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20241113, - 2139 + 20250104, + 1240 ], "deps": [ "ace-window", @@ -123542,8 +123916,8 @@ "pfuture", "s" ], - "commit": "2fd7745f1bc446fc590dc7ba2eb4e062a51fbb3e", - "sha256": "0pspxkja58zpic2gnprhg5jkdy49ydw09rgg9wpf6vjwr5zbxp5b" + "commit": "ac3f0706bf6248b7321da683438efdcc6bce3e4c", + "sha256": "0r0iwf4606l21aljh971lbndjdynbm9yxvzcg9srrlgmf80ghzxp" }, "stable": { "version": [ @@ -123603,15 +123977,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20241222, + 1336 ], "deps": [ "evil", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "011f310eeb51db0ccad7b00b7cbd0f1ccddbb588", + "sha256": "1d988i32j4y3c1w4b5sh4962z2j78nyi4x0r6l4rp171g6649k1v" }, "stable": { "version": [ @@ -123812,15 +124186,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20241202, + 2117 ], "deps": [ "dash", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "4364a660447fa5f322c172f6b310115bbc091d12", + "sha256": "0kaj5yhi9380xhdgkybn6qwlm92d8j53rd00qf516nvwjg1fsnys" }, "stable": { "version": [ @@ -124283,14 +124657,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20240322, - 2129 + 20241215, + 2343 ], "deps": [ "request" ], - "commit": "26c2627f70badfd4cf6069c31ebc20fa8b03136d", - "sha256": "0xqk230ah7dr2casm4hmxhp85dks030v310ah3n7az5csdzs6xpr" + "commit": "bf482b445ac00addffcff634bc4ca51021d7f373", + "sha256": "187laykgr5cs7y8fl08arsmyav0imhjiqismgbgxbvdvfanf4bgj" } }, { @@ -124517,14 +124891,14 @@ "repo": "deadblackclover/twtxt-el", "unstable": { "version": [ - 20240730, - 151 + 20241219, + 937 ], "deps": [ "request" ], - "commit": "d6a0fc57bcc7dd4a4a76a0836beb33900878ea0b", - "sha256": "1s5xzi1zqvl6395ynyrlq89d8cisnwzsdj1hgyw6zzd2vz4xy65z" + "commit": "8780c0f637ce5687033a0a0820df41d60d0d49b9", + "sha256": "0r469n76xahhqsyalan45fhn67i4a4fw3cnlkfi6yxgfh33hbl2w" } }, { @@ -125117,11 +125491,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20240707, - 1410 + 20241206, + 219 ], - "commit": "dbb3e4b699dd488497ef9b32a04b8e928a6bc8ef", - "sha256": "1f4vsg68fylcp2cqc74mbw4zls3n0zq8wvyd0vahy9km7fr753p4" + "commit": "399cc12f907f81a709f9014b6fad0205700d5772", + "sha256": "1d4ff3y67fy1zrs1qcbwh4grnw0jw9gvnrwrsripyav5w7bd03sw" } }, { @@ -125132,11 +125506,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20240713, - 1427 + 20241212, + 40 ], - "commit": "beb0e285d074145eaf481a959c903b77c19ae91e", - "sha256": "02wvdnzc229aga5pjb5sqbpi22afjqn6q5v8qay901bgc6r6f9pl" + "commit": "d90d42ddba8fa42ef5dc109196545caeabb42b75", + "sha256": "167y0hjpcgg2g6pf69kgimk0mx9afki53q1prwrl89ph5w7lf6db" } }, { @@ -125481,11 +125855,20 @@ "repo": "Lindydancer/unifdef", "unstable": { "version": [ - 20200517, - 514 + 20250102, + 1047 ], - "commit": "7a4b76f664c4375e3d98e8af0a29270752c13701", - "sha256": "0xx954cyvzndj7fy6k203nlnhaxi6d0pn3xrvy287dh9ydklng0m" + "commit": "4a428d544893e91835b625fab38fdac964dcff88", + "sha256": "1608krphhk9igwn4snc2xh4zlmbjfl968h5y27k2nag25g0igmv1" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "commit": "4a428d544893e91835b625fab38fdac964dcff88", + "sha256": "1608krphhk9igwn4snc2xh4zlmbjfl968h5y27k2nag25g0igmv1" } }, { @@ -125520,14 +125903,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20241130, - 1714 + 20250102, + 729 ], "deps": [ "hydra" ], - "commit": "f9177e8b476db6f388ad4eac1a98b5d6129e7f61", - "sha256": "1vhan0dpxq7k5bi863hyb3fn8k8x7m6vidr4b4blj601bmdygk7k" + "commit": "9a40005adb12f2c66a9457a8088f8b44c9fae9f4", + "sha256": "1ppalp1y5azs7yi42aynrxzalhf59hxybnyhlvnwdsy8i1m8d2vm" } }, { @@ -126178,11 +126561,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20240401, - 611 + 20250101, + 1013 ], - "commit": "694282b9ba7669fcbceb7088808147f68e3ac066", - "sha256": "1760x85gisl5s2wh7b4y7h334b2vv7cz2a158w0w2kjgshbjdwdi" + "commit": "78a0a55a036cce9442ffb3aae1bb00a2e1e4a78c", + "sha256": "1kvpfw8gblyiy9vymvi52d9967xz7544dskx3qs9x4djcc95ayqh" }, "stable": { "version": [ @@ -126311,6 +126694,24 @@ "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" } }, + { + "ename": "uv-mode", + "commit": "82304b059d6594ae5723d5dd72abb310130d8541", + "sha256": "0p12wnr8w9jvymmcam1fpb8w8dnccd2cfvz9714a1h1vdqg7f29k", + "fetcher": "github", + "repo": "z80dev/uv-mode", + "unstable": { + "version": [ + 20241216, + 640 + ], + "deps": [ + "pythonic" + ], + "commit": "4055d9e05fb54a4fbb655fa4413728b3db7bcd68", + "sha256": "1kyb5a6bpji0j6znq0whnvnz3h0np3giz5q0hdbiz20bs8iq5894" + } + }, { "ename": "uwu-theme", "commit": "32b645e4304be3340c29e466f9b082a4e4855631", @@ -127047,20 +127448,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20241021, - 1914 + 20241223, + 1316 ], - "commit": "c05263f8cad09b9bf13b03ad9198c40400f31483", - "sha256": "1dihjsyi7qi7znqai3r2fa9ggb7mggzsap3723bhj5pkl0gfq9ld" + "commit": "2c46542a64e79919496f5a8255b7321f6ba00fd1", + "sha256": "0kkdlckbmj8sq1r8if53c6hdqgy92vxvcx5c2dm8byndmjnqqc2n" }, "stable": { "version": [ - 2, - 16, + 3, + 0, 0 ], - "commit": "442e9ddaa658bc9e8d3e50f930e2024fd88a3aa9", - "sha256": "1jyav9y2awzaaiz8drlwgb3170pv6ra95zaichfyywdhxxny0fw5" + "commit": "2c46542a64e79919496f5a8255b7321f6ba00fd1", + "sha256": "0kkdlckbmj8sq1r8if53c6hdqgy92vxvcx5c2dm8byndmjnqqc2n" } }, { @@ -127108,8 +127509,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20240917, - 2129 + 20241205, + 2105 ], "deps": [ "ag", @@ -127124,14 +127525,14 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "e8af8cfea86dd3cddacf5d069f04f2d84e6f6a71", - "sha256": "1m47cvqcyv7i2wjy3hadpma223kkr0jpnf9wp8jbcqzin30sp8cx" + "commit": "ca8713c3a406877976314e41ff75896cb44c7560", + "sha256": "1q5ca8la3wynqwkgaqwdyk36dshrr3yzmn9a22zpcmwnddhgahrn" }, "stable": { "version": [ 0, 6, - 1 + 2 ], "deps": [ "ag", @@ -127146,8 +127547,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "a30077eaee6187551003c8176c42e18145fe6be4", - "sha256": "0ypyp3j40nalq9sixn3dcjxh4m0fmhaibvzb6w13r2jsgw5dr0dd" + "commit": "f7e70560d817125721aa7e02a2f527fce15bcf30", + "sha256": "18vig4bkd74vzws9kgqlgalx0j1dcszg2i5gc3h00is7gimhhgj8" } }, { @@ -127158,23 +127559,26 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20240925, - 1626 + 20241211, + 1357 ], "deps": [ "verilog-mode" ], - "commit": "583bd26d05981820a8e4280278cb638cd00b4fd2", - "sha256": "1bd0hlb9fcf1zmprfp54kdmp28s2i5ipvzqi2plz5f510aif20h0" + "commit": "096d385bb7d6f03ac93ccc21ebeb6b4a1313d463", + "sha256": "0cir562zxlspmbyx644a7cpvr5nly7qw5ili4sg91vpnvvzxgxi2" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], - "commit": "460d78f524cae677e86c8bbba2ce4e3c57e47cbf", - "sha256": "1s8p1yacxx8l85kfw71q6y9hrii918h4478jvxkjkcxai0qkrfan" + "deps": [ + "verilog-mode" + ], + "commit": "85153dd3442b88213cb53b4c484b4173f9f040a3", + "sha256": "12da6drd429bdk8figvfnp7jwzd0vvcirdngl8v717agk9mbzh7n" } }, { @@ -127263,25 +127667,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20241105, - 2131 + 20250101, + 928 ], "deps": [ "compat" ], - "commit": "b0f9e7679be590b976576e4056b6af4b31212ab0", - "sha256": "0wsd1d5grrmpyywxl1fgfw2wd4i65fd6g5dml7a58i6fq44jr8r9" + "commit": "7f36ecf5a550b7605da3433448970448deac4bb3", + "sha256": "02kz5ahg3b0m2ymllzmbzcpcr1kqjlcpanpd244mmgfyyrcr81a7" }, "stable": { "version": [ 1, - 9 + 10 ], "deps": [ "compat" ], - "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005", - "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p" + "commit": "6ef99c9219b55b7618d111d352caf795ba07bc54", + "sha256": "1np7qjfydbbq1zkp9dsmgx7pnv4yw4rqhg7b0s1l9sqmdka0n4ph" } }, { @@ -127370,8 +127774,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20241016, - 1217 + 20241205, + 1630 ], "deps": [ "ag", @@ -127383,14 +127787,14 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "28838b9722933889c8af4b9b543db07ccd2d2b66", - "sha256": "1fm42f0fhnychix1mzhlnrchnipi9qq5cl9sjlhmfxz0wflrbqij" + "commit": "3f5f0778e87d9d4272903797a2366e603f9f1641", + "sha256": "0vgmhsgrh8x8br5grnh1jnf01r2q148xxyf028jgaq09wwjkdvkc" }, "stable": { "version": [ 0, 5, - 3 + 4 ], "deps": [ "ag", @@ -127402,8 +127806,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "28838b9722933889c8af4b9b543db07ccd2d2b66", - "sha256": "1fm42f0fhnychix1mzhlnrchnipi9qq5cl9sjlhmfxz0wflrbqij" + "commit": "3f5f0778e87d9d4272903797a2366e603f9f1641", + "sha256": "0vgmhsgrh8x8br5grnh1jnf01r2q148xxyf028jgaq09wwjkdvkc" } }, { @@ -127447,20 +127851,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20240917, - 2134 + 20241211, + 1404 ], - "commit": "c7531eea98e2947f7dae0339510060a25bb34568", - "sha256": "0wxv5ryrik84wj4qzxpplgwvg2rdcrhf78z98w4wpxm6qzi1mr5x" + "commit": "05bb98bec618395ab59e1c11a27dafc0a8b7ee96", + "sha256": "1095y6a0pph8pimzypxb3y6pl6v33r9lxhcjd8sliz3v9x5blpy7" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 2 ], - "commit": "bfde06b42d4cb03df7fa50495adb2994bdec99d9", - "sha256": "16h0h7dwf5lhc14ldxj675dqy5paiklzbh7yqxa0v05wis1iyi4j" + "commit": "0f2e70eddab3bc000ad12625f31c62bea0c5994b", + "sha256": "0vqq1819czzliicanv00hhv13zy9apvj4326pnj9n3iqx45q6a96" } }, { @@ -127561,11 +127965,11 @@ "repo": "jamescherti/vim-tab-bar.el", "unstable": { "version": [ - 20240830, - 340 + 20241202, + 2307 ], - "commit": "4d101f14bd388ddc6264c276013eac9760559b0f", - "sha256": "0dhkzbcr2dc0pq9g15ggx3vryik8xchlw2kknznsr8x1b2jg2kmq" + "commit": "51c0fb29613ab9e7544723667b32be79e7b33c7c", + "sha256": "0rdsz2caiac103f338njnga9rpnc257dr7z5d17j0phhfh4xbwnx" }, "stable": { "version": [ @@ -127866,19 +128270,19 @@ "repo": "szermatt/visual-replace", "unstable": { "version": [ - 20241124, - 1051 + 20250102, + 2043 ], - "commit": "19544555e7b5bba624238217a295fd4c80c0ed1d", - "sha256": "1sqxwl8ahn4sm553chidh281nj46ppn2yhwlgfj4d0bv7ng0fj8r" + "commit": "a2ae4d0116192d34d5142857cb7c27c8091c4da5", + "sha256": "054z8p1kw698ifigcx5pyb8wnz988h0k2hny89515n84p3d0z0m0" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "d9a89fa02c6170a1b417b3e71e85d481213f318b", - "sha256": "05s21qhq23mmv8in88qxfbq79h26j14vcw5pc112sjr1a4fl5306" + "commit": "64fce4fd7d3df297be52045992e44591d49f4d52", + "sha256": "1bvaw44mkiz6yq1r5hvayfp0iaxqcwbzihdrbizyynm4qjzspca1" } }, { @@ -128034,11 +128438,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20240729, - 2203 + 20250101, + 910 ], - "commit": "54f887bea8a5846b96febd1faf93c5910b8ac10b", - "sha256": "0rs1ppx82bhvnjakn4k12ycfxlia8v0gzbv8wgmyxr4gkl8c1n2g" + "commit": "a1a59ebd0fb9294224da31d4b62070ea3fe3c28d", + "sha256": "1fml15d9hy8fqbz1wnkz4l31h2fdfpb64dqd3pphqzqgxrx5qamr" }, "stable": { "version": [ @@ -128057,11 +128461,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20240729, - 2203 + 20250101, + 910 ], - "commit": "e07fdeb808763b65dd918d7ae936744bc60d49fa", - "sha256": "0c4djxj5wzp394rdn3q425qcdpgzm5qla7s4dykpn9ysj0dsj71w" + "commit": "b469a2b7376789494e3448b0722b12556043204a", + "sha256": "03cyfkww8kss3xpsymb9y2ld7jhsb6rslyl5skhjpmsr85gj74wa" }, "stable": { "version": [ @@ -128149,11 +128553,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20241118, - 1627 + 20241218, + 331 ], - "commit": "fd50624723200f4ac261f122f6332f57796c782f", - "sha256": "0sfgpg6d4xj97sf3vsmxyh13vmdz9gsln1lcp05inkavyxz02xb1" + "commit": "f64729ed8b59e46ce827d28222c4087c538de562", + "sha256": "0bbkw9l44ir03s8lxbnci0gaaqhgj5wb3rqgj2nygaq0ih4mqvg9" } }, { @@ -128426,11 +128830,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20241030, - 52 + 20241220, + 536 ], - "commit": "cce39eb257b27f737b4264f7b41c70ae70dc3906", - "sha256": "0zzc7p2b8nqqp8gn0px5jds3fj895gx1n2igvkwmz4v429p7wkgb" + "commit": "2118b53c2ce16bb8568a9948d7378d3515c2471c", + "sha256": "1ynmaml2hyf1r1pmm5b2fkrmj4kslgqq55bhy32ps0759imwv7la" } }, { @@ -128581,16 +128985,16 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20221007, - 1937 + 20241204, + 2234 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "f5021a4d9f16a2013e67a9fa7c121f87bf030203", - "sha256": "0i2yr9iv8zd8nwhap96smab1657gldrayypm18jpbfq8md6cmkg5" + "commit": "b8260b6c1c6bdc8878c6f8cbeeea05040ac92b65", + "sha256": "1l3hg4spzgf4ymqp9ka7dys4hp1p227y1lf4cbni4ngz6ajynh26" }, "stable": { "version": [ @@ -128991,11 +129395,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20240804, - 821 + 20241227, + 530 ], - "commit": "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2", - "sha256": "0lvixg4c5apwrpqljj11b3yrq8nklz4ky4njnh8y6h1j5bisx40p" + "commit": "be2d59c8fa02b1a45ae54ce4079e502e659cefe6", + "sha256": "0v1yq3lk0lvvc3yjs38lsmipa8x5lkz38pdm0v30npsi0dmh1h5r" }, "stable": { "version": [ @@ -129307,60 +129711,6 @@ "sha256": "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98" } }, - { - "ename": "weechat", - "commit": "e38255a31a4ca31541c97a506a55f82e2670abe6", - "sha256": "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46", - "fetcher": "github", - "repo": "the-kenny/weechat.el", - "unstable": { - "version": [ - 20190520, - 1551 - ], - "deps": [ - "cl-lib", - "s", - "tracking" - ], - "commit": "d9a13306ea8be27367f92e9202d116a88fa1f441", - "sha256": "1z9lav09jsmhshlk0xnbp21y9apzhd9zv08h88sdg942v0fn2fid" - }, - "stable": { - "version": [ - 0, - 5, - 0 - ], - "deps": [ - "cl-lib", - "s", - "tracking" - ], - "commit": "8cbda2738149b070c09288df550781b6c604beb2", - "sha256": "1i930jaxpva9s6y3fj3nny46b70g4mqdjl54mcv2rzj95bp4f908" - } - }, - { - "ename": "weechat-alert", - "commit": "7a69ad48eabb166f66e6eb5c5cdc75aefc8b989f", - "sha256": "026hkddvd4a6wy7s8s0lklw8b99fpjawdgi7amvpcrn79ylwbf22", - "fetcher": "github", - "repo": "Kungi/weechat-alert", - "unstable": { - "version": [ - 20160416, - 1248 - ], - "deps": [ - "alert", - "cl-lib", - "weechat" - ], - "commit": "a8fd557c8f335322f132c1c6c08b6741d6394e2e", - "sha256": "1hkhim2jfdywx6ks4qfcizycp5qsx4ms6929kbgmzzb8i7j380x6" - } - }, { "ename": "weibo", "commit": "21f4c1b34f86331ecbcdbdc39858a191232902f2", @@ -130229,15 +130579,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20240504, - 1017 + 20241207, + 148 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "776c5ef8fe2f0da0f9885526e3556af0f5736600", - "sha256": "0w23mljzw314nbr63wzl8m04ii1zjbl5gxgvmr9g8mfq848brsbf" + "commit": "c827f45cd9b278b3eb9c2f4bcb55ef2fca5d3048", + "sha256": "0qfbhi3kaxh8bn889iwh6y9ix6cx94valj9nn3119nxipxpl9r9c" }, "stable": { "version": [ @@ -130814,11 +131164,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20240104, - 603 + 20250104, + 1247 ], - "commit": "38a05283c014812c0a54207aa6146f163c707fa5", - "sha256": "181am26kb18aw0g93la2c5037p5d6fn6da8knsj0zf1rmisr2qyc" + "commit": "f6ca7c7068e2cca8260ae8b061b41cee60d5845c", + "sha256": "1zb6rf9f71kskzfrg5ynzy1mjp733yprkbnamnqk900cd9yzna5p" } }, { @@ -130859,11 +131209,11 @@ "repo": "gromnitsky/wordnut", "unstable": { "version": [ - 20180313, - 443 + 20241229, + 739 ], - "commit": "feac531404041855312c1a046bde7ea18c674915", - "sha256": "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn" + "commit": "dffc75a455d0d4458b7555f4c051c51d71c8e18a", + "sha256": "1clhgpxicy9pbgq4bwr2iiwgnhzgxlqvqn1anxka9zlk04parmwm" } }, { @@ -130874,11 +131224,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20241020, - 1145 + 20241203, + 1648 ], - "commit": "698fa410232830a8acb249a422be33a58dd4c6ee", - "sha256": "0cbvg9pgclkf2mwnslnvalnl6z9gznkmzpap83g8pvgrbjrjbgcc" + "commit": "4f68d155ceb3328c3263faee86cfb82d50402f05", + "sha256": "0kv0b2nbaafjznclahymxcrp2mj06v71887jg5rlj2i09mb0igf1" } }, { @@ -131087,16 +131437,16 @@ "repo": "dangom/writefreely.el", "unstable": { "version": [ - 20221221, - 1456 + 20241222, + 1909 ], "deps": [ "org", - "ox-gfm", + "ox-hugo", "request" ], - "commit": "db70444eb5fbe0820754574d70b1ae44967607dc", - "sha256": "1570vi25pwsws8dskmgclnxc6hjwma44wwvddnnmp8jy8a4fsa3l" + "commit": "cfcd21b82dc4a4543efb6209fc0a4f4bc3c78e4a", + "sha256": "1m2gcw61p0aqfchvz6y35938jv0b49p7jp0lkm0q7v7pbf0qmk3l" } }, { @@ -132234,26 +132584,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20240623, - 1904 + 20241223, + 1723 ], "deps": [ "yaml" ], - "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726", - "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2" + "commit": "f7706ea170de98d29b7cdd5a4f189bd038b1e27b", + "sha256": "0gx6sxr68bbmqv6rbs9gd4kfgw0avg2fqgbwq14n35yfgr18xc7l" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 1 ], "deps": [ "yaml" ], - "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726", - "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2" + "commit": "f7706ea170de98d29b7cdd5a4f189bd038b1e27b", + "sha256": "0gx6sxr68bbmqv6rbs9gd4kfgw0avg2fqgbwq14n35yfgr18xc7l" } }, { @@ -132501,14 +132851,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20241014, - 949 + 20241207, + 2221 ], "deps": [ "yasnippet" ], - "commit": "23bcbcd11f567a2659ae413c62c82892eb50a3f1", - "sha256": "0g1d676jq6ayisck2garlk9cwvf8m6w17ajw07mybcadq2nm03g9" + "commit": "f1907ed38acc479e78d5c113810465e4d77d8604", + "sha256": "063vfm49909qqy6m2qh8bcliwznh6758178va3g2vn06hqhz3znb" }, "stable": { "version": [ @@ -132694,14 +133044,14 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20241022, - 2200 + 20250104, + 1648 ], "deps": [ "compat" ], - "commit": "d3437030bcd8d64b2e5a3bc579e2f2f0b4581d1f", - "sha256": "1szi2ghx67vrs76dnv3bfjx12rdhyskm6bf2yjkrlf03fy1r8api" + "commit": "c4e3488b0a4ca3113c27f55aefc7ae44837e4fda", + "sha256": "06frawlz2b6lh2cc53039sga6zv2jq1gwdi5s7csfhgck3hkq2mm" }, "stable": { "version": [ @@ -133125,10 +133475,10 @@ }, { "ename": "zeno-theme", - "commit": "e6f007367d181005ebd1a4d73085d73e807d3583", - "sha256": "01kp0j27q9v62d45ail65al9zzfxpx7d7bj6gdzilbmwk3k7lxq5", + "commit": "f6633f0376fd50b6cc45d96c67848dbf8f38e210", + "sha256": "0akc4llnam4p699v01szhf0xj7r6475y14kbpxli29n5612cwdax", "fetcher": "github", - "repo": "zenobht/zeno-theme", + "repo": "sacredyak/zeno-theme", "unstable": { "version": [ 20211205, @@ -133616,11 +133966,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240926, - 1826 + 20241205, + 926 ], - "commit": "8e361577b8cf01f20a65222ca4ce90720a3d74a6", - "sha256": "1qj560cy1ncj7czl0jbbjahxcqjn01263ahd7db78m3kgshjv6r7" + "commit": "2bd80f73485927a081d06a754d7f299b1350c5e7", + "sha256": "14kszbnd0yj5y2q0ba71a0r969b6nwz8sij84h2g3aqdlnnj7f6m" }, "stable": { "version": [ @@ -134080,15 +134430,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20240203, - 647 + 20241231, + 1929 ], "deps": [ "deferred", "request" ], - "commit": "7eae5196dbe6fa3045b31412538ce4a81204abc4", - "sha256": "12h0fi1fz33747h807gg29wgqqm3yzfn34m79zkvdicxiaj920ny" + "commit": "4057a310d0fc6034f3825ee584f8ea6f81dd6251", + "sha256": "1fmm0n1ck7xrgxy6jnyyfhw3vz4i9f82gjx87vv74mscb3v8l8mm" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f88249db0a54..30c8e49a454d 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -9,7 +9,6 @@ common-updater-scripts, git, nix, - nixfmt-classic, coreutils, gnused, callPackage, @@ -75,7 +74,6 @@ stdenv.mkDerivation rec { lib.makeBinPath [ common-updater-scripts git - nixfmt-classic nix coreutils gnused @@ -87,9 +85,6 @@ stdenv.mkDerivation rec { if [ ! "$oldVersion" = "$latestTag" ]; then update-source-version ${pname} "$latestTag" --version-key=version --print-changes - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix" - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index f8e5fc9ad1fd..47795ac8954b 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -23,10 +23,10 @@ let # certain plugins need a custom configuration (available in passthru.initLua) # to work with nix. # if true, the wrapper automatically appends those snippets when necessary - , autoconfigure ? false + , autoconfigure ? true # append to PATH runtime deps of plugins - , autowrapRuntimeDeps ? false + , autowrapRuntimeDeps ? true # should contain all args but the binary. Can be either a string or list , wrapperArgs ? [] diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7d33dfe0a01b..d6a8185048bb 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0905"; + version = "9.1.0990"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-sFsTONGeSocn1M8NZo5LjIhagmq/nR1zrGRN7p86Q4o="; + hash = "sha256-KKjJCuGczwYP+NVx5f6YQRsKR0zW44ciNNvmjQ03ytM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c8a41ce8e821..031e690ece6e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10771,6 +10771,18 @@ final: prev: meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; + pomo-nvim = buildVimPlugin { + pname = "pomo.nvim"; + version = "2024-07-30"; + src = fetchFromGitHub { + owner = "epwalsh"; + repo = "pomo.nvim"; + rev = "aa8decc421d89be0f10b1fc6a602cdd269f350ff"; + sha256 = "1drld6dmibkg4b35n181v98gwfi8yhshx1gfkg82k72a5apr77dl"; + }; + meta.homepage = "https://github.com/epwalsh/pomo.nvim/"; + }; + pony-vim-syntax = buildVimPlugin { pname = "pony-vim-syntax"; version = "2017-09-26"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1a78e3eb4793..0fac70eb1665 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -11,7 +11,6 @@ fetchurl, neovimUtils, replaceVars, - substituteAll, # Language dependencies fetchYarnDeps, mkYarnModules, @@ -58,6 +57,7 @@ tmux, tup, typescript, + typescript-language-server, vim, which, xdg-utils, @@ -188,8 +188,7 @@ in aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ - (substituteAll { - src = ./patches/aw-watcher-vim/program_paths.patch; + (replaceVars ./patches/aw-watcher-vim/program_paths.patch { curl = lib.getExe curl; }) ]; @@ -1103,8 +1102,7 @@ in super.fruzzy.overrideAttrs (old: { buildInputs = [ nim1 ]; patches = [ - (substituteAll { - src = ./patches/fruzzy/get_version.patch; + (replaceVars ./patches/fruzzy/get_version.patch { inherit (old) version; }) ]; @@ -1243,8 +1241,7 @@ in gx-nvim = super.gx-nvim.overrideAttrs { patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./patches/gx-nvim/fix-paths.patch; + (replaceVars ./patches/gx-nvim/fix-paths.patch { inherit xdg-utils; }) ]; @@ -1530,10 +1527,7 @@ in # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 # https://github.com/camspiers/lens.vim/pull/40/files patches = [ - (substituteAll { - src = ./patches/lens-vim/remove_duplicate_g_lens_animate.patch; - inherit languagetool; - }) + ./patches/lens-vim/remove_duplicate_g_lens_animate.patch ]; }; @@ -1662,8 +1656,7 @@ in in super.markdown-preview-nvim.overrideAttrs { patches = [ - (substituteAll { - src = ./markdown-preview-nvim/fix-node-paths.patch; + (replaceVars ./markdown-preview-nvim/fix-node-paths.patch { node = "${nodejs}/bin/node"; }) ]; @@ -2573,8 +2566,7 @@ in "openscad.utilities" ]; patches = [ - (substituteAll { - src = ./patches/openscad.nvim/program_paths.patch; + (replaceVars ./patches/openscad.nvim/program_paths.patch { htop = lib.getExe htop; openscad = lib.getExe openscad; zathura = lib.getExe zathura; @@ -2683,8 +2675,7 @@ in Preview-nvim = super.Preview-nvim.overrideAttrs { patches = [ - (substituteAll { - src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; + (replaceVars ./patches/preview-nvim/hardcode-mdt-binary-path.patch { mdt = lib.getExe md-tui; }) ]; @@ -3308,6 +3299,9 @@ in nvim-lspconfig plenary-nvim ]; + runtimeDeps = [ + typescript-language-server + ]; }; nvzone-typr = super.nvzone-typr.overrideAttrs { @@ -3534,8 +3528,7 @@ in # let g:grammarous#show_first_error = 1 # see https://github.com/rhysd/vim-grammarous/issues/39 patches = [ - (substituteAll { - src = ./patches/vim-grammarous/set_default_languagetool.patch; + (replaceVars ./patches/vim-grammarous/set_default_languagetool.patch { inherit languagetool; }) ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7a51279ed415..0a373bd6064a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/aklt/plantuml-syntax/,, https://github.com/nvim-treesitter/playground/,, https://github.com/nvim-lua/plenary.nvim/,, https://github.com/olivercederborg/poimandres.nvim/,HEAD, +https://github.com/epwalsh/pomo.nvim/,HEAD, https://github.com/dleonard0/pony-vim-syntax/,, https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e24bdfed8941..3a7d09a05c2b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4231,8 +4231,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.2"; - hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94="; + version = "4.0.1"; + hash = "sha256-DN7VRLr5IaqCdsbADriH0AuUODGL8OeZWbCSozQTboU="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 35ac41fd106e..973b8cbb7c04 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.1.1"; - hash = "sha256-xpVb+5neAvMv8ebQlObjVE/lNd7Gn/KLbQAZ9AvQRFI="; + version = "3.1.11"; + hash = "sha256-DxeMTbbDXofhq4+WvO8fpczyxorSJSw6bU3c8xFdDgg="; }; meta = { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 625d048b8da0..fdc8c05b090b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -57,6 +57,11 @@ callPackage ./generic.nix rec { updateScript = ./update-vscodium.sh; + # Editing the `codium` binary (and shell scripts) within the app bundle causes the bundle's signature + # to be invalidated, which prevents launching starting with macOS Ventura, because VSCodium is notarized. + # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. + dontFixup = stdenv.hostPlatform.isDarwin; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/pkgs/applications/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index 7608e5c57eb4..faf4f2c30748 100644 --- a/pkgs/applications/emulators/wine/builder-wow.sh +++ b/pkgs/applications/emulators/wine/builder-wow.sh @@ -1,6 +1,4 @@ ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64 - -source $stdenv/setup preFlags="${configureFlags}" unpackPhase diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 3d87723f4404..c0dc9e9af2bb 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -5,7 +5,7 @@ pkgsi686Linux, pkgsCross, callPackage, - substituteAll, + replaceVars, moltenvk, wineRelease ? "stable", supportFlags, @@ -80,8 +80,7 @@ with src; mingwW64.buildPackages.gcc ]; monos = [ mono ]; - buildScript = substituteAll { - src = ./builder-wow.sh; + buildScript = replaceVars ./builder-wow.sh { # pkgconfig has trouble picking the right architecture pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.glib diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9258defc289d..e5e552f299f9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, autoreconfHook, pkg-config, intltool, @@ -74,8 +74,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # to remove compiler from the runtime closure, reference was retained via # gimp --version --verbose output - (substituteAll { - src = ./remove-cc-reference.patch; + (replaceVars ./remove-cc-reference.patch { cc_version = stdenv.cc.cc.name; }) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b1c8f5a9ea09..b03b88c3c7b2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -41,7 +41,7 @@ , potrace , python3 , runCommand -, substituteAll +, replaceVars , wrapGAppsHook3 , libepoxy , zlib @@ -92,15 +92,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; }) - (substituteAll { - src = ./fix-python-paths.patch; + (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. python3 = lib.getExe python3Env; }) - (substituteAll { + (replaceVars ./fix-ps2pdf-path.patch { # Fix path to ps2pdf binary - src = ./fix-ps2pdf-path.patch; inherit ghostscript; }) ]; @@ -113,6 +111,13 @@ stdenv.mkDerivation (finalAttrs: { # double-conversion is a dependency of 2geom substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \ --replace-fail 'find_package(DoubleConversion REQUIRED)' "" + # use native Python when cross-compiling + shopt -s globstar + for f in **/CMakeLists.txt; do + substituteInPlace $f \ + --replace-quiet "COMMAND python3" "COMMAND ${lib.getExe python3Env.pythonOnBuildForHost}" + done + shopt -u globstar ''; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index 840ba0333bb5..669ae89edd43 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -2,7 +2,7 @@ lib, writeScript, fetchFromGitHub, - substituteAll, + replaceVars, inkscape, pdflatex, lualatex, @@ -33,8 +33,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ # Make sure we can point directly to pdflatex in the extension, # instead of relying on the PATH (which might not have it) - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit pdflatex lualatex; }) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index ce1b3521d046..75f90b2f4431 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -6,8 +6,7 @@ , cmake , pkg-config , wrapGAppsHook3 -, boost -, boost183 +, boost186 , cereal , cgal , curl @@ -72,14 +71,6 @@ let patches = [ ]; - - # Build requires at least Boost v1.83. If the mainline package satisfies - # that, just use the mainline package, otherwise use an explicitly versioned - # package. - boost183OrBetter = - if lib.versionAtLeast boost.version "1.83" - then boost - else boost183; in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; @@ -111,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ binutils - boost183OrBetter + boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799 cereal cgal curl diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 23ac32ce240a..6cded45faf1c 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.0"; + version = "1.7.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-YKOqgUMK+FYYemxDcxfDV42z/1qSSja6M7NAt+UaFEo="; + hash = "sha256-97ehL61C6q/8Hlbt3bMkrZ33V+Z4a4xatc5p1Tw5NIw="; }; buildInputs = diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 72a5f47d9053..a1cfab39320c 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -8,7 +8,7 @@ qtbase, qttools, libnova, - proj_7, + proj, libpng, openjpeg, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { bzip2 qtbase libnova - proj_7 + proj openjpeg libpng ]; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 72c39afafb36..f82e788578c9 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,27 +766,27 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.264", + "version": "132.0.6834.83", "deps": { "depot_tools": { - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" + "rev": "41d43a2a2290450aeab946883542f8049b155c87", + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" }, "gn": { - "rev": "95b0f8fe31a992a33c040bbe3867901335c12762", - "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" + "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a", + "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" }, "ungoogled-patches": { - "rev": "131.0.6778.264-1", - "hash": "sha256-u/2iKhrJRbvOtv5Yi/AfSpR7Xu4NjBTF5G03wsVGEKo=" + "rev": "132.0.6834.83-1", + "hash": "sha256-yL7eMNTL1FDoqXcwuHx5BzjjESjzsIfdzHCTZW9jXUo=" }, - "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" + "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "2d05e31515360f4da764174f7c448b33e36da871", - "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=", + "rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c", + "hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=", "recompress": true }, "src/third_party/clang-format/script": { @@ -796,18 +796,23 @@ }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96", - "hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ=" + "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9", + "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221", - "hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA=" + "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d", + "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c", - "hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo=" + "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce", + "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=" + }, + "src/third_party/llvm-libc/src": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", + "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206", + "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -826,8 +831,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "4811f9e01c4cfcbf9c6957015063eaaa0d92be91", - "hash": "sha256-98wwIeMTF2Wg2sJ07U1OUV83wR9nJOjGubp7Vnk3kj8=" + "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02", + "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -836,13 +841,13 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "e0175250977c2b2b95087afc0857883538a1386c", - "hash": "sha256-1O+hnZF73AY44jcmajJlpaQY5PV4+x0hYwqf1TtMahY=" + "rev": "9616efc903b7469161996006c8cf963238e26503", + "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", - "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", - "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=" + "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", + "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=" }, "src/third_party/accessibility_test_framework/src": { "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git", @@ -851,8 +856,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ac6cda4cbd716102ded6a965f79573b41581898d", - "hash": "sha256-7Zfc262U42G6BUlxnLp6sQ78VlWBt0pTzkYwXY0rqaE=" + "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b", + "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -866,8 +871,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "179dd9f858f0f5b0e52b61aefc621dc82e2ad34a", - "hash": "sha256-B7X9PTlMQdolsvEfuCNaKnRFcvsPNZtn5FOcJBY6sCA=" + "rev": "f674555ab03e6355e0981a647c115097e9fe5324", + "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -881,13 +886,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2", - "hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo=" + "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200", + "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", - "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" + "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b", + "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -896,8 +901,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "080aeb7199e66e4b0a2b6383fd26a9f8d2cccbf5", - "hash": "sha256-YHEBGqfftgK68wWAWVTxtbl1GECBT1qTNe7irYkM/8k=" + "rev": "ac36a797d3470e8ee906b98457a59270d01db30d", + "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -921,38 +926,38 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "815ff2bb4038144dea89c33021bc4429f22a130f", - "hash": "sha256-28uZotrv+/MBBo+pcBWY3Csqrdv5Y4DxGbGEwK9Cwdw=" + "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564", + "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", - "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=" + "rev": "00fe003dac355b979f36157f9407c7c46448958e", + "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=" }, "src/third_party/google_benchmark/src": { "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "344117638c8ff7e239044fd0fa7085839fc03021", - "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=" + "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", + "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=" }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "cd95210465496ac2337b313cf49f607762abe286", - "hash": "sha256-172yvjgbFWQyd0PBRl74PJzpY/mDGC85D7PdeogNodU=" + "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed", + "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", - "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=" + "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38", + "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=" + "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05", + "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=" }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "44791916611acec1cd74c492c7453e46d9b0dbd2", - "hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M=" + "rev": "b91cf840ac3255ef03b23cc93621369627422a1a", + "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -961,8 +966,8 @@ }, "src/third_party/chromium-variations": { "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "7d681838b57a25ca6659b9cc0111f879147c416b", - "hash": "sha256-zio8SqKEqOYYjVWZnzfrPqngqym2lZu9M/hgSi3ey0Q=" + "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d", + "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=" }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", @@ -981,8 +986,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "1e83a2fdd3102f65c6f1fb602c1b320486218a99", - "hash": "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg=" + "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4", + "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -991,23 +996,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "b08c5ad457bddea2664ba20fb25beb3d1799fed2", - "hash": "sha256-cwpcY8YTXk+VVIFphO5ihc5rvbG3ZY9iHeK81P5DHBs=" + "rev": "554629b9242e6ae832ef14e3384654426f7fcc06", + "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "b4d7ae714c548c3e139b95a85582dc15ece1d2f7", - "hash": "sha256-1RDDbvce5WR32if3cFYxiU9HS04x3BYIgOFJPMVJSBo=" + "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f", + "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" + "rev": "41d43a2a2290450aeab946883542f8049b155c87", + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "5284f1c63b2b08c47b8915ce713a1aace991dfe9", - "hash": "sha256-1Nh9SVIAde4jxgwFucbtZpl6rMyPM4Plfi+dhwP0wI8=" + "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24", + "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1016,8 +1021,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "7eea0a9213e801ad9479a6499fd0330ec1db8693", - "hash": "sha256-JkOjOnLrDOcYHi3hptT1BDRvsKpTtOsBHT8YLb1hlJM=" + "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830", + "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1031,8 +1036,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "686d6944501a6ee9c849581e3fe343273d4af3f6", - "hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM=" + "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910", + "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1066,8 +1071,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0", - "hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA=" + "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f", + "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -1116,8 +1121,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "62df7bdbc10887e094661e07ec2595b7920376fd", - "hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M=" + "rev": "d144031940543e15423a25ae5a8a74141044862f", + "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -1141,8 +1146,8 @@ }, "src/third_party/libFuzzer/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", - "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=" + "rev": "a7128317fe7935a43d6c9f39df54f21113951941", + "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=" }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", @@ -1161,28 +1166,23 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "840f8797871cc587f7113ea9d2483a1156d57c0e", - "hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk=" + "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e", + "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=" }, "src/third_party/libavif/src": { "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "2c36aed375fff68611641b57d919b191f33431d5", - "hash": "sha256-fApdfzEtQnmio6BVzkcr/VkwojrNs+cx/+Am80H9dXw=" + "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da", + "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "ffad64ff4e349f926ad5ffcc882e205a94156d77", - "hash": "sha256-M2ExAgLm/NZ2soQEv3Ap/qx/B3+nd3NdDqYOL0E/pc8=" - }, - "src/third_party/libavifinfo/src": { - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", - "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=" + "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4", + "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "1b382075dd1bd545655af7ebef949b3090061b74", - "hash": "sha256-kpyJiFXtk8eK8EkgzUbG0GS+znEeqzlB62qy9tPpEC8=" + "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13", + "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -1206,8 +1206,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "902e8ca804ae6c05f505e510c16647c32ce4d1cb", - "hash": "sha256-j2m9zVajkAdPF1ehLX0Gxp4LyMunhFDDCzrCm2WzArc=" + "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb", + "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1256,8 +1256,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "906334ac1de2b0afa666472dce5545b82c1251fb", - "hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc=" + "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3", + "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1271,8 +1271,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "a8e59d207483f75b87dd5fc670e937672cdf5776", - "hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM=" + "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f", + "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1306,8 +1306,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "4f27c4f1698522dfcea36dca948a13e2eaf4c26c", - "hash": "sha256-dosSqpFlvli60ZJ0vexVZOK/FmzOYq5BDrZKZW0lMfc=" + "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417", + "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1321,13 +1321,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "7a8409531fbb58d7d15ae331e645977b113d7ced", - "hash": "sha256-KlqgaOxKJQHHjU1g1VCcJEBhv809DdEUedrxdk8N99I=" + "rev": "84a8011ec69d0e2de271c05be7d62979608040d9", + "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "24764a1d9c2fce1e9816ffae691f00353ade330d", - "hash": "sha256-FAaxTuIYExmL3PSWwcvLpnPD4qsGDGr4/CIyi0NSrnI=" + "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd", + "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1346,8 +1346,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=" + "rev": "413da873d93a03d3662f24b881ea459a79f9c589", + "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -1366,8 +1366,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", - "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" + "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a", + "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1386,8 +1386,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "7a9a492a38b7c701f7c96a15a76046aed8f8c0c3", - "hash": "sha256-6uBO4jwPSqhT4j+KTE0Za7B4prrE2kstsHNtHwTJX+Q=" + "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9", + "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1396,18 +1396,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "689e8a82f8070a372981b7476fb673e243330d71", - "hash": "sha256-tImVDNyS5hCN6A1ODeVuB7XLCNr3EdxN8x961nPCM9g=" + "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c", + "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "73fd75175922012f21557239b7743a152ea7f1fd", - "hash": "sha256-D8UIXXQX6dTxbuqFgd6AbmErr1r9839yiN6MrJlsqPw=" + "rev": "0b56dd5952b25fad65139b64096fcd187048ed38", + "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "2acc4ea0028bc703be2d4e9bc8a4032d015d6516", - "hash": "sha256-mwcvSRycM8bq3dDWk4yfkL8Tg5bfEap6lrr1Oxemzy4=" + "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0", + "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1416,38 +1416,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "50bc4debdc3eec5045edbeb8ce164090e29b91f3", - "hash": "sha256-Zv5QZ8MmP45MH5e6EBDNPmP0vcjjNXJHKva5MNh5ovA=" + "rev": "996c728cf7dcfb29845cfa15222822318f047810", + "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "42b315c15b1ff941b46bb3949c105e5386be8717", - "hash": "sha256-xb0TlPyXP2wu7jMrWZu+z8WC5mk0CbYgvkZEt3r+mww=" + "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3", + "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "14345dab231912ee9601136e96ca67a6e1f632e7", - "hash": "sha256-ny/UVx4r+Fj39ZEepaWqDPplAJcrBQEQlkqsSofwLJ0=" + "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278", + "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "bd1c8ea9c6ac51e4c3a6ddb9d602bb204678eb5f", - "hash": "sha256-Ze/DGiD8Zj3mY+5Pi+tf6xMrX2YBqfl4Nc37b/JgmnI=" + "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7", + "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "c9a5acda16dc2759457dc856b5d7df00ac5bf4a2", - "hash": "sha256-0JzqUW6XbhPbLGs/smuNG6zQoWP8iaAO5VglGSyN94g=" + "rev": "15f2de809304aba619ee327f3273425418ca83de", + "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "8c907ea21fe0147f791d79051b18e21bc8c4ede0", - "hash": "sha256-2abhzNt/rKbAhGQZhUhQ2LoemtU1Yh1fx9rrijOtjy4=" + "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09", + "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "cbb4ab171fc7cd0b636a76ee542e238a8734f4be", - "hash": "sha256-nKpS0ddAsN2KhOg6J/SwB8ZlVXrJTVixD4DuUkyxb6c=" + "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f", + "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -1486,13 +1486,13 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "ae8b3ca40fbeee0bc67ef41a6c5b6dd5af839344", - "hash": "sha256-7u5Ay43GtcVTt3Cwg/5OaYQdG6SXXYtUun7DVN+XChE=" + "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9", + "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", - "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" + "rev": "afaf497805cbb502da89991c2dcd783201efdd08", + "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1511,8 +1511,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "3986629de01e518a3f2359bf5629ef2b7ef72330", - "hash": "sha256-x8GQUj75mQXswI3b29tS9u25Zx3peYqDM8v1/wkC9cs=" + "rev": "d1d33679661a34f03a806af2b813f699db3004f9", + "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=" }, "src/tools/page_cycler/acid3": { "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", @@ -1521,13 +1521,13 @@ }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", - "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=" + "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480", + "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1", - "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58=" + "rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c", + "hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU=" } } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 5c645dc7165c..c97fdea4af83 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "134.0-1", + "packageVersion": "134.0.1-1", "source": { - "rev": "134.0-1", - "sha256": "bu9ec9gK4b1OkC2Z1ycr/lmhrSB5TcIqcHXaZxf0Vmw=" + "rev": "134.0.1-1", + "hash": "sha256-YtZb+VaJu+zofIjJUUx6FjVsEb1sCgFsGlxgP++Yki0=" }, "firefox": { - "version": "134.0", - "sha512": "EnWmhtwKJ7SN9K4FYWURUS9nbgNHTjCVslIerCWjhdNFqj6HhnFtvoEq9J4H1ysydyR5CJ1kiWjiAEygycNTRA==" + "version": "134.0.1", + "hash": "sha512-P0DKWnU6ZuCK9OixLXX+q2ewVn7P/TT1zwE/Sa64CczUWMgBHpRW3JAsJOr2JgeBF4dFFOtAzuVXTq/Ok+53LQ==" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index ead541fa36d6..da05c980e09b 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -8,15 +8,19 @@ let in { inherit (src) packageVersion; - source = fetchFromGitea { - domain = "codeberg.org"; - owner = "librewolf"; - repo = "source"; - fetchSubmodules = true; - inherit (src.source) rev sha256; - }; - firefox = fetchurl { - url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; - inherit (src.firefox) sha512; - }; + source = fetchFromGitea ( + src.source + // { + domain = "codeberg.org"; + owner = "librewolf"; + repo = "source"; + fetchSubmodules = true; + } + ); + firefox = fetchurl ( + src.firefox + // { + url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; + } + ); } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index affa96aadbdd..347c15a2e25b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.169.2"; + version = "0.170.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-OoCLFhGeciCUC7Tb6+Md8tmamc/j0AeSlu5Krmkhxyc="; + hash = "sha256-HlSpY7+Qct2vxtAejrwmmWhnWq+jVycjuxQ42KScpSs="; }; - vendorHash = "sha256-VBgWnDi0jaZ+91kkYeX9QyNBrP9W+mSMjexwzZiKZWs="; + vendorHash = "sha256-BmEtzUUORY/ck158+1ItVeiG9mzXdikjjUX7XwQ7xoo="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 82d332e70dbf..c8618f1fb9fb 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -120,9 +120,9 @@ rec { nomad_1_9 = generic { buildGoModule = buildGo123Module; - version = "1.9.4"; - sha256 = "sha256-yhOyHfD5099dCY7lIJzTb8tQrqQ86N8HVtSk5mB7saY="; - vendorHash = "sha256-Cxjgs4Hmv0sq11OpvYLnNcc76ojwqwcxMmCZT5Or0f4="; + version = "1.9.5"; + sha256 = "sha256-NIv3QPSYoYrDQxxtNDHc3DdBLb45oUdA5Jyjke+XzD8="; + vendorHash = "sha256-y4WBOSfkRYNQRWu5B/j2JBLPAxJ1fyLD0DEAjB10Sl8="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch deleted file mode 100644 index 3305653d025f..000000000000 --- a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh ---- rsync-3.2.7/configure.sh 2022-10-20 17:57:22 -+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58 -@@ -7706,7 +7706,7 @@ else $as_nop - #include - #include - #include --main() -+int main() - { - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 1cd9b2ec725f..cfdd6b54d50b 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { pname = "rsync"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + # signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; + hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI="; }; nativeBuildInputs = [ @@ -35,23 +35,6 @@ stdenv.mkDerivation rec { perl ]; - patches = [ - # https://github.com/WayneD/rsync/pull/558 - ./configure.ac-fix-failing-IPv6-check.patch - ./CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch - ./CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch - ./CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch - ./CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch - ./CVE-2024-12086/0002-added-secure_relative_open.patch - ./CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch - ./CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch - ./CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch - ./CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch - ./CVE-2024-12088/0001-make-safe-links-stricter.patch - ./CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch - ./raise-protocol-version-to-32.patch - ]; - buildInputs = [ libiconv diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 01317f647589..44672bcf4cf4 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, - fetchFromGitLab, + callPackage, isPy3k, isPyPy, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (callPackage ./src.nix { }) version src; format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-core"; diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 2e88ee23bfe5..a2bbb74abd31 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, - fetchFromGitLab, + callPackage, isPy3k, isPyPy, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (callPackage ./src.nix { }) version src; format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-gtk"; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index 0d0cee9f69fc..da40d64aff0c 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, - fetchFromGitLab, + callPackage, pyenchant, scikit-learn, pypillowfight, @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "paperwork-backend"; - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (callPackage ./src.nix { }) version src; format = "pyproject"; sourceRoot = "${src.name}/paperwork-backend"; diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 3f8876779d83..0ff7a13e031f 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -1,5 +1,6 @@ { lib, + callPackage, python3Packages, gtk3, cairo, @@ -9,7 +10,6 @@ dbus, libnotify, wrapGAppsHook3, - fetchFromGitLab, which, gettext, gobject-introspection, @@ -32,7 +32,7 @@ let imagemagick perlPackages.Po4a ]; - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit (callPackage ./src.nix { }) version src sample_documents; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 21e3976a9ada..787c7193ef9f 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, - fetchFromGitLab, + callPackage, isPy3k, isPyPy, @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (callPackage ./src.nix { }) version src; format = "pyproject"; sourceRoot = "${src.name}/paperwork-shell"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 5f83eddd3fb7..7038309799e8 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,14 +1,34 @@ -{ fetchFromGitLab }: +{ + fetchFromGitLab, + srcOnly, + fetchpatch, +}: rec { version = "2.2.5"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - repo = "paperwork"; - group = "World"; - owner = "OpenPaperwork"; - rev = version; - sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; + src = srcOnly { + pname = "paperwork-patched-src"; + inherit version; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork"; + group = "World"; + owner = "OpenPaperwork"; + rev = version; + sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; + }; + patches = [ + # fix installing translations + # remove on next release + ( + assert version == "2.2.5"; + fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/b8e2633ace0f3d9d57e68c27db8f594b8a5ddd7e.patch"; + hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8="; + } + ) + ]; }; + sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork-test-documents"; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index c69de023e25f..9b05d201f933 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,12 +1,15 @@ { lib, stdenv, + substitute, + fetchpatch, fetchurl, fetchFromGitHub, cmake, pkg-config, # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations - boost, + # Pin Boost 1.86 due to use of boost::asio::io_service. + boost186, ncurses, enableCApi ? true, enablePythonApi ? true, @@ -162,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = finalAttrs.pythonPath ++ [ - boost + boost186 libusb1 ] ++ optionals (enableExamples) [ @@ -179,6 +182,23 @@ stdenv.mkDerivation (finalAttrs: { # Build only the host software preConfigure = "cd host"; patches = [ + # fix for boost 187 remove on next update + (substitute { + src = fetchpatch { + name = "boost-187.patch"; + url = "https://github.com/EttusResearch/uhd/commit/adfe953d965e58b5931c1b1968899492c8087cf6.patch"; + hash = "sha256-qzxe6QhGoyBul7YjCiPJfeP+3dIoo1hh2sjgYmc9IiI="; + }; + # The last two hunks in client.cc will fail without these substitutions + substitutions = [ + "--replace-fail" + "[buffer, idx, func_name, p, this]" + "[=]" + "--replace-fail" + "[buffer, this]" + "[=]" + ]; + }) # Disable tests that fail in the sandbox, last checked at version 4.6.0.0 ./no-adapter-tests.patch ]; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index f7426dd11270..10bb0010a940 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.19.2"; + version = "1.21"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-cfYEmWaOTAjn10X7/yTBXMigl3q6sazV0rtBm9sGXpY="; + hash = "sha256-BXJLCDprbwMF/K5SQ6BWzDbPgmMJw8uTR6a4nuP8Wto="; }; # tests require `bgzip` from the htslib package diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 57779cb487d0..4ec161a89758 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.0"; + version = "2.47.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-HOEU2ohwQnG0PgJ8UeBNk5n4yI6e91Qtrnrrrn2HvE4="; + hash = "sha256-89j5uyOuOSN06RzZ05WXDavFucXucvOYhGE82Epu0xA="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index aed17b3461e2..de5ccce0025b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -39,11 +39,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.8.2"; + version = "6.9"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-qsYYEGdorR7ZdsP+fIZZ/smebwtTN+pupVT66EkMT04="; + hash = "sha256-YpYEKT3yvoFx7IVr9Pi0+qjkMFrxNgfc4PifdBMoNtY="; }; format = "other"; @@ -55,7 +55,7 @@ let rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - hash = "sha256-/HjgGtjKfLLufEqyT7xHYIlC5xnVunYoA+H1xLS1bVw="; + hash = "sha256-E8Q0hMLPLkUZ5W5iqe4w5t/71HQuRBTF3SRUBN8EMik="; sourceRoot = "mercurial-${version}/rust"; } else diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index e060ee1e03bf..cb6028325f5b 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -8,13 +8,13 @@ let drv = stdenv.mkDerivation rec { pname = "controller-topology-project"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; rev = "v${version}"; - sha256 = "sha256-6g4dyR34b0YgxlzRRS2C/gY3wjlO9MMYEB2fHLSCqC4="; + sha256 = "sha256-NRoI28LqXbsF6Icym98SWLHNl+WD8TsJ0P+ELf/JhyQ="; }; postPatch = '' diff --git a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix index 7a54d749e3fe..4eb15356d236 100644 --- a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-fishbmc"; namespace = "visualization.fishbmc"; - version = "20.2.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-MgeSIKAy0N2NMGsU/15tKtDb34CROjcMaKjGyySl9Z0="; + hash = "sha256-JAiWkW9iaOq+Q2tArxJ+S7sXQM2K010uT09j30rTY0I="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix index da5ee17c0ee5..9bf4477fe2d3 100644 --- a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-goom"; namespace = "visualization.goom"; - version = "20.1.1"; + version = "21.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-TxXqJQdPT1+3DwAJv0F2Hfksh+ZV4QjfOnp4/k53GpQ="; + hash = "sha256-Cu0XRv2iU35bakbS5JkjSYAW5Enra1gt1I0sebcapx4="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix index df53b1e5489d..7fe93c76e200 100644 --- a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-pictureit"; namespace = "visualization.pictureit"; - version = "20.2.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-mQDPjpsxStU01H2XJKnX183KAHG+O1CH8JOmApMmwMc="; + hash = "sha256-0soMNqff/aVANDFORL3mqUUpi2BWmauUtE4EBr3QwlI="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index 38ab9d308762..f9fb728c73d3 100644 --- a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-projectm"; namespace = "visualization.projectm"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-wjSQmOtQb4KjY3iH3Xh7AdQwE6ked+cpW6/gdNYS+NA="; + hash = "sha256-M+sHws9wp0sp1PnYXCLMZ9w48tJkG159XkyNvzHJNYo="; }; extraBuildInputs = [ pkg-config libGL projectm ]; diff --git a/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix index 399674ee40fa..77a871c967ad 100644 --- a/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix @@ -12,13 +12,13 @@ buildKodiBinaryAddon rec { pname = "visualization-shadertoy"; namespace = "visualization.shadertoy"; - version = "20.3.0"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-PaHbEcB4gCC8gUzc7T49msI8f0xa2iXqSaYW/eqD8yw="; + hash = "sha256-M70WQL4BqFI4LMFLBXlupuXxRkbTqA0OocYlCbY28VQ="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix index 19f9c2f0e6bd..6afbca9ca4a9 100644 --- a/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-spectrum"; namespace = "visualization.spectrum"; - version = "20.2.0"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-rl6eydHv0g646H7478UQboVp/OrKExQYJOiaVDeDRhE="; + hash = "sha256-8yGmZeLJ8AdT17yqYVxYbmkZ6DqhlCyblbTUzf8MhE4="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index ccb3735425ae..e1464f9a445a 100644 --- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "visualization-waveform"; namespace = "visualization.waveform"; - version = "20.2.1"; + version = "21.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-e1SIpMmfnS92X4f114MKch4o9Ke80aIzw6OQPrEb8d0="; + hash = "sha256-ocLiDt9Fvwb/KvCsULyWRCNK0vOGMh/r88PRn1WYyXs="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix index adade1bfac91..a459aa6ad851 100644 --- a/pkgs/applications/video/mpv/scripts/modernz.nix +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.2.3"; + version = "0.2.4"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-yjxMBGXpu7Uyt0S9AW8ewGRNzbdu2S8N0st7VSKlqcc="; + hash = "sha256-njFVAxrO5mGaf5zSA4EZN31SakWcroBZuGXYvTnqi68="; }; postInstall = '' diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 7f6637ec3f61..8dce8caae6a0 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -15,12 +15,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-bddPyOx8tCG+us9QQxO1t7rZK1HfZy3TFWtd5mPw2o4="; + sha256 = "sha256-T/A85lkKCjBaEaXGxVTurc1VY01mBCTv8t8m5qzvtpY="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index be348027945a..8ec8874f51e4 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -38,7 +38,7 @@ libvpx, nettools, dbus, - substituteAll, + replaceVars, gsoap, zlib, xz, @@ -235,10 +235,11 @@ stdenv.mkDerivation (finalAttrs: { # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, # after the code that unsets it. Note that qtsvg is included so that SVG icons from # the user's icon theme can be loaded. - ++ optional (!headless && enableHardening) (substituteAll { - src = ./qt-env-vars.patch; - qtPluginPath = "${qtbase}/bin/${qtbase.qtPluginPrefix}:${qtsvg}/bin/${qtbase.qtPluginPrefix}:${qtwayland}/bin/${qtbase.qtPluginPrefix}"; - }) + ++ optional (!headless && enableHardening) ( + replaceVars ./qt-env-vars.patch { + qtPluginPath = "${qtbase}/bin/${qtbase.qtPluginPrefix}:${qtsvg}/bin/${qtbase.qtPluginPrefix}:${qtwayland}/bin/${qtbase.qtPluginPrefix}"; + } + ) # While the KVM patch should not break any other behavior if --with-kvm is not specified, # we don't take any chances and only apply it if people actually want to use KVM support. ++ optional enableKvm ( diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 975dfb4c3d93..29b695fd0848 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -1,4 +1,4 @@ -#!@shell@ +#!@runtimeShell@ # shellcheck shell=bash if [ -n "$DEBUG" ] ; then diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index b46872439d76..24f1524bad11 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -11,19 +11,22 @@ }: rec { - appimage-exec = pkgs.substituteAll { + appimage-exec = pkgs.replaceVarsWith { src = ./appimage-exec.sh; isExecutable = true; dir = "bin"; - path = lib.makeBinPath [ - bash - binutils-unwrapped - coreutils - gawk - libarchive - pv - squashfsTools - ]; + replacements = { + inherit (pkgs) runtimeShell; + path = lib.makeBinPath [ + bash + binutils-unwrapped + coreutils + gawk + libarchive + pv + squashfsTools + ]; + }; }; extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }: diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index cb5b5fca2208..878439cb31a6 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -348,7 +348,7 @@ stdenvNoCC.mkDerivation { ## # TODO(@sternenseemann): make a generic strip wrapper? - + optionalString (bintools.isGNU or false || bintools.isCCTools or false) '' + + optionalString (bintools.isGNU or false || bintools.isLLVM or false || bintools.isCCTools or false) '' wrap ${targetPrefix}strip ${./gnu-binutils-strip-wrapper.sh} \ "${bintools_bin}/bin/${targetPrefix}strip" '' diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index a3a3eddc52bc..944e45edac1b 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -237,6 +237,11 @@ if [ "$NIX_SET_BUILD_ID_@suffixSalt@" = 1 ] && ! (( "$relocatable" )); then extraAfter+=(--build-id="${NIX_BUILD_ID_STYLE:-sha1}") fi +# if a ld-wrapper-hook exists, run it. +if [[ -e @out@/nix-support/ld-wrapper-hook ]]; then + linker=@prog@ + source @out@/nix-support/ld-wrapper-hook +fi # Optionally print debug info. if (( "${NIX_DEBUG:-0}" >= 1 )); then diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 7953032b09a7..d416ff58e2cb 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -1,6 +1,7 @@ #! @perl@ -w use strict; +use feature 'signatures'; use Cwd 'abs_path'; use IO::Handle; use File::Path; @@ -18,8 +19,7 @@ my $extraPrefix = $ENV{"extraPrefix"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"}; -sub isInPathsToLink { - my $path = shift; +sub isInPathsToLink($path) { $path = "/" if $path eq ""; foreach my $elem (@pathsToLink) { return 1 if @@ -32,8 +32,7 @@ sub isInPathsToLink { # Returns whether a path in one of the linked packages may contain # files in one of the elements of pathsToLink. -sub hasPathsToLink { - my $path = shift; +sub hasPathsToLink($path) { foreach my $elem (@pathsToLink) { return 1 if $path eq "" || @@ -44,8 +43,7 @@ sub hasPathsToLink { } # Similar to `lib.isStorePath` -sub isStorePath { - my $path = shift; +sub isStorePath($path) { my $storePath = "@storeDir@"; return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath; @@ -76,22 +74,18 @@ for my $p (@pathsToLink) { sub findFiles; -sub findFilesInDir { - my ($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_; - +sub findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) { opendir DIR, "$target" or die "cannot open `$target': $!"; my @names = readdir DIR or die; closedir DIR; foreach my $name (@names) { next if $name eq "." || $name eq ".."; - findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority); + findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs); } } -sub checkCollision { - my ($path1, $path2) = @_; - +sub checkCollision($path1, $path2) { if (! -e $path1 || ! -e $path2) { return 0; } @@ -109,14 +103,11 @@ sub checkCollision { return compare($path1, $path2) == 0; } -sub prependDangling { - my $path = shift; +sub prependDangling($path) { return (-l $path && ! -e $path ? "dangling symlink " : "") . "`$path'"; } -sub findFiles { - my ($relName, $target, $baseName, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_; - +sub findFiles($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) { # The store path must not be a file when not ignoreSingleFileOutputs if (-f $target && isStorePath $target) { if ($ignoreSingleFileOutputs) { @@ -193,8 +184,8 @@ sub findFiles { } } - findFilesInDir($relName, $oldTarget, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $oldPriority) unless $oldTarget eq ""; - findFilesInDir($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority); + findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority, $ignoreSingleFileOutputs) unless $oldTarget eq ""; + findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs); $symlinks{$relName} = ["", $priority]; # denotes directory } @@ -203,13 +194,11 @@ sub findFiles { my %done; my %postponed; -sub addPkg { - my ($pkgDir, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_; - +sub addPkg($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) { return if (defined $done{$pkgDir}); $done{$pkgDir} = 1; - findFiles("", $pkgDir, "", $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority); + findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs); my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; if (-e $propagatedFN) { @@ -240,9 +229,9 @@ for my $pkg (@{decode_json $pkgs}) { for my $path (@{$pkg->{paths}}) { addPkg($path, $ENV{"ignoreCollisions"} eq "1", - $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", - $pkg->{priority}) + $pkg->{priority}, + $ENV{"ignoreSingleFileOutputs"} eq "1") if -e $path; } } @@ -257,7 +246,7 @@ while (scalar(keys %postponed) > 0) { my @pkgDirs = keys %postponed; %postponed = (); foreach my $pkgDir (sort @pkgDirs) { - addPkg($pkgDir, 2, $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $priorityCounter++); + addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++, $ENV{"ignoreSingleFileOutputs"} eq "1"); } } @@ -269,9 +258,9 @@ if ($extraPathsFilePath) { chomp $line; addPkg($line, $ENV{"ignoreCollisions"} eq "1", - $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", - 1000) + 1000, + $ENV{"ignoreSingleFileOutputs"} eq "1") if -d $line; } diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index ecbe3d477fa1..9abd07e99525 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -2,7 +2,11 @@ needsTarget=true for p in "${params[@]}"; do case "$p" in - -target | --target=*) needsTarget=false ;; + -target | --target=*) + needsTarget=false + + echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 + ;; esac done diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index da1a709684da..a6120931381e 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -131,7 +131,7 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then # Old bash empty array hack for p in ${params+"${params[@]}"}; do if [[ "$p" = -m*=native ]]; then - skip "$p" + >&2 echo "warning: Skipping impure flag $p because NIX_ENFORCE_NO_NATIVE is set" else kept+=("$p") fi @@ -232,6 +232,12 @@ if [[ "${#positionalArgs[@]}" -gt 0 ]]; then extraAfter+=(-- "${positionalArgs[@]}") fi +# if a cc-wrapper-hook exists, run it. +if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then + compiler=@prog@ + source @out@/nix-support/cc-wrapper-hook +fi + # Optionally print debug info. if (( "${NIX_DEBUG:-0}" >= 1 )); then # Old bash workaround, see ld-wrapper for explanation. @@ -246,12 +252,6 @@ fi PATH="$path_backup" # Old bash workaround, see above. -# if a cc-wrapper-hook exists, run it. -if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then - compiler=@prog@ - source @out@/nix-support/cc-wrapper-hook -fi - if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/cc-params.XXXXXX") trap '@rm@ -f -- "$responseFile"' EXIT diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b03097a49a0c..2e569c15885e 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -980,7 +980,8 @@ rec { mkdir $out ${if enableFakechroot then '' - proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c ' + proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -e -c ' + if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi source $stdenv/setup eval "$fakeRootCommands" tar \ @@ -994,7 +995,8 @@ rec { -cf $out/layer.tar . ' '' else '' - fakeroot bash -c ' + fakeroot bash -e -c ' + if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi source $stdenv/setup cd old_out eval "$fakeRootCommands" diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix index 9ea46394e4b1..7ddd7a556d40 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -3,7 +3,7 @@ runtimeShell, nix, lib, - substituteAll, + replaceVarsWith, nuget-to-nix, nixfmt-rfc-style, nuget-to-json, @@ -84,15 +84,16 @@ attrs let drv = builtins.unsafeDiscardOutputDependency fetch-drv.drvPath; - innerScript = substituteAll { + innerScript = replaceVarsWith { src = ./fetch-deps.sh; isExecutable = true; - inherit cacert; - binPath = lib.makeBinPath [ - nuget-to-nix - nixfmt-rfc-style - nuget-to-json - ]; + replacements = { + binPath = lib.makeBinPath [ + nuget-to-nix + nixfmt-rfc-style + nuget-to-json + ]; + }; }; defaultDepsFile = diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index 60e1e327274a..8d4315350ad5 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -97,5 +97,5 @@ dotnetFixupHook() { } if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then - preFixupPhases+=" dotnetFixupHook" + appendToVar preFixupPhases dotnetFixupHook fi diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 4515e0e82f49..4542691ae93f 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source "$stdenv/setup" - echo "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 7e4dde4a64c8..ec66a43d6ff8 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - (echo "#!$SHELL"; \ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh chmod +x ssh diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 39838db255a6..f34e98fdcb0f 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - tagtext="" tagflags="" # Darcs hashes are sha1 (120 bits, 40-character hex) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 489914a2a8b4..4bbff3d3f3cb 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,5 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source "${stdenv}/setup" echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index 95b193490a82..90ed35fc17a9 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -35,7 +35,6 @@ in stdenv.mkDerivation { inherit name; builder = writeText "${fetcher}-builder.sh" '' - source "$stdenv/setup" echo "${fetcher} exporting to $out" declare -A creds diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index e07a6a1a79dd..bb03c865bedc 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation { }; builder = writeScript "xpibuilder" '' - source $stdenv/setup - echo "firefox addon $name into $out" UUID="${extid}" diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index fe828d0ada9d..43462834b19e 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,5 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup echo "Cloning Fossil $url [$rev] into $out" # Fossil, bless its adorable little heart, wants to write global configuration diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 95176beea8c1..e112703773cd 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -3,8 +3,6 @@ # - revision specified and remote has a HEAD # - revision specified and remote without HEAD # -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup echo "exporting $url (rev $rev) into $out" diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 20dfde4b10d4..786b4c86ff50 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,5 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup echo "getting $url${rev:+ ($rev)} into $out" hg clone --insecure "$url" hg-clone diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index 1ddd111b1518..f41eab6b7e30 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - # Curl flags to handle redirects, not use EPSV, handle cookies for # servers to need them during redirects, and work on SSL without a # certificate (this isn't a security problem because we check the diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index de929fad55a9..cace650df841 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - set -x if ! [ -f "$cacheDB" ]; then diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index e187747f14e6..b8f18eeda32b 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - echo "exporting $url (r$rev) into $out" if test -n "$http_proxy"; then diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index e553446346de..622ac81a4602 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - echo "exporting $url (r$rev) into $out" if test "$sshSupport"; then diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index a82728ef1025..0f142cdd3fa0 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - source $mirrorsFile curlVersion=$(curl -V | head -1 | cut -d' ' -f2) diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/pkgs/build-support/fetchurl/write-mirror-list.sh index 2dabd2e722be..8f5e710a435a 100644 --- a/pkgs/build-support/fetchurl/write-mirror-list.sh +++ b/pkgs/build-support/fetchurl/write-mirror-list.sh @@ -1,4 +1,2 @@ -source $stdenv/setup - # !!! this is kinda hacky. set | grep -E '^[a-zA-Z]+=.*://' > $out diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 58cfbb15babe..722bae0243ea 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -237,8 +237,8 @@ in local cmd="$1" dir="$2" declare -a flags - flags+=(''${tags:+-tags=''${tags// /,}}) - flags+=(''${ldflags:+-ldflags="$ldflags"}) + flags+=(''${tags:+-tags=$(concatStringsSep "," tags)}) + flags+=(''${ldflags:+-ldflags="''${ldflags[*]}"}) flags+=("-p" "$NIX_BUILD_CORES") if (( "''${NIX_DEBUG:-0}" >= 1 )); then flags+=(-x) @@ -282,7 +282,7 @@ in '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # normalize cross-compiled builds w.r.t. native builds ( - dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH} + dir=$GOPATH/bin/''${GOOS}_''${GOARCH} if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then mv $dir/* $dir/.. fi diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0149c5d487ac..defa8a7d9b8e 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - set -o pipefail objects=($objects) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index b581b6e7d403..b53c64e30525 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - # When no modules are built, the $out/lib/modules directory will not # exist. Because the rest of the script assumes it does exist, we # handle this special case first. diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index 80287e60a33a..8d206034f7ea 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, callPackage, rustPlatform, - substituteAll, + replaceVars, openssl, Security, python3Packages, @@ -27,8 +27,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; - setupHook = substituteAll { - src = ./setup-hook.sh; + setupHook = replaceVars ./setup-hook.sh { inherit openssl; ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; }; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 3339c2fd2ce5..8cc8708211dc 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -66,7 +66,7 @@ fn fixup_lockfile( { if let Some(Value::String(resolved)) = package.get("resolved") { if let Some(Value::String(integrity)) = package.get("integrity") { - if resolved.starts_with("git+ssh://") { + if resolved.starts_with("git+") { fixed = true; package diff --git a/pkgs/build-support/replace-vars/default.nix b/pkgs/build-support/replace-vars/default.nix deleted file mode 100644 index 0088279ad939..000000000000 --- a/pkgs/build-support/replace-vars/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenvNoCC }: - -/** - `replaceVars` is a wrapper around the [bash function `substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) - in the stdenv. It allows for terse replacement of names in the specified path, while checking - for common mistakes such as naming a replacement that does nothing or forgetting a variable which - needs to be replaced. - - As with the [`--subst-var-by`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute-subst-var-by) - flag, names are encoded as `@name@` in the provided file at the provided path. - - Any unmatched variable names in the file at the provided path will cause a build failure. - - By default, any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement - has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them. - - # Inputs - - `path` ([Store Path](https://nixos.org/manual/nix/latest/store/store-path.html#store-path) String) - : The file in which to replace variables. - - `attrs` (AttrsOf String) - : Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) or - null to keep it unchanged. - - # Example - - ```nix - { replaceVars }: - - replaceVars ./greeting.txt { world = "hello"; } - ``` - - See `../../test/replace-vars/default.nix` for tests of this function. -*/ -path: attrs: - -let - # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail. - subst-var-by = - name: value: - lib.optionals (value != null) [ - "--replace-fail" - (lib.escapeShellArg "@${name}@") - (lib.escapeShellArg value) - ]; - - replacements = lib.concatLists (lib.mapAttrsToList subst-var-by attrs); - - left-overs = map ({ name, ... }: name) ( - builtins.filter ({ value, ... }: value == null) (lib.attrsToList attrs) - ); -in - -stdenvNoCC.mkDerivation { - name = baseNameOf (toString path); - src = path; - doCheck = true; - dontUnpack = true; - preferLocalBuild = true; - allowSubstitutes = false; - - buildPhase = '' - runHook preBuild - substitute "$src" "$out" ${lib.concatStringsSep " " replacements} - runHook postBuild - ''; - - # Look for Nix identifiers surrounded by `@` that aren't substituted. - checkPhase = - let - lookahead = - if builtins.length left-overs == 0 then "" else "(?!${builtins.concatStringsSep "|" left-overs}@)"; - regex = lib.escapeShellArg "@${lookahead}[a-zA-Z_][0-9A-Za-z_'-]*@"; - in - '' - runHook preCheck - if grep -Pqe ${regex} "$out"; then - echo The following look like unsubstituted Nix identifiers that remain in "$out": - grep -Poe ${regex} "$out" - echo Use the more precise '`substitute`' function if this check is in error. - exit 1 - fi - runHook postCheck - ''; -} diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix new file mode 100644 index 000000000000..14a1e6a8e1e3 --- /dev/null +++ b/pkgs/build-support/replace-vars/replace-vars-with.nix @@ -0,0 +1,131 @@ +{ lib, stdenvNoCC }: + +/** + `replaceVarsWith` is a wrapper around the [bash function `substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) + in the stdenv. It allows for terse replacement of names in the specified path, while checking + for common mistakes such as naming a replacement that does nothing or forgetting a variable which + needs to be replaced. + + As with the [`--subst-var-by`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute-subst-var-by) + flag, names are encoded as `@name@` in the provided file at the provided path. + + Any unmatched variable names in the file at the provided path will cause a build failure. + + By default, any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement + has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them. + + # Inputs + + `src` ([Store Path](https://nixos.org/manual/nix/latest/store/store-path.html#store-path) String) + : The file in which to replace variables. + + `replacements` (AttrsOf String) + : Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) or + null to keep it unchanged. + + `dir` (String) + : Sub directory in $out to store the result in. Commonly set to "bin". + + `isExecutable` (Boolean) + : Whether to mark the output file as executable. + + Most arguments supported by mkDerivation are also supported, with some exceptions for which + an error will be thrown. + + # Example + + ```nix + { replaceVarsWith }: + + replaceVarsWith { + src = ./my-setup-hook.sh; + replacements = { world = "hello"; }; + dir = "bin"; + isExecutable = true; + } + ``` + + See `../../test/replace-vars/default.nix` for tests of this function. Also see `replaceVars` for a short + version with src and replacements only. +*/ +{ + src, + replacements, + dir ? null, + isExecutable ? false, + ... +}@attrs: + +let + # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail. + subst-var-by = + name: value: + lib.optionals (value != null) [ + "--replace-fail" + (lib.escapeShellArg "@${name}@") + (lib.escapeShellArg value) + ]; + + substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements); + + left-overs = map ({ name, ... }: name) ( + builtins.filter ({ value, ... }: value == null) (lib.attrsToList replacements) + ); + + optionalAttrs = + if (builtins.intersectAttrs attrs forcedAttrs == { }) then + builtins.removeAttrs attrs [ "replacements" ] + else + throw "Passing any of ${builtins.concatStringsSep ", " (builtins.attrNames forcedAttrs)} to replaceVarsWith is not supported."; + + forcedAttrs = { + doCheck = true; + dontUnpack = true; + preferLocalBuild = true; + allowSubstitutes = false; + + buildPhase = '' + runHook preBuild + + target=$out + if test -n "$dir"; then + target=$out/$dir/$name + mkdir -p $out/$dir + fi + + substitute "$src" "$target" ${lib.concatStringsSep " " substitutions} + + if test -n "$isExecutable"; then + chmod +x $target + fi + + runHook postBuild + ''; + + # Look for Nix identifiers surrounded by `@` that aren't substituted. + checkPhase = + let + lookahead = + if builtins.length left-overs == 0 then "" else "(?!${builtins.concatStringsSep "|" left-overs}@)"; + regex = lib.escapeShellArg "@${lookahead}[a-zA-Z_][0-9A-Za-z_'-]*@"; + in + '' + runHook preCheck + if grep -Pqe ${regex} "$target"; then + echo The following look like unsubstituted Nix identifiers that remain in "$target": + grep -Poe ${regex} "$target" + echo Use the more precise '`substitute`' function if this check is in error. + exit 1 + fi + runHook postCheck + ''; + }; +in + +stdenvNoCC.mkDerivation ( + { + name = baseNameOf (toString src); + } + // optionalAttrs + // forcedAttrs +) diff --git a/pkgs/build-support/replace-vars/replace-vars.nix b/pkgs/build-support/replace-vars/replace-vars.nix new file mode 100644 index 000000000000..4c9241187b82 --- /dev/null +++ b/pkgs/build-support/replace-vars/replace-vars.nix @@ -0,0 +1,36 @@ +{ replaceVarsWith }: + +/** + `replaceVars` is a wrapper around the [bash function `substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) + in the stdenv. It allows for terse replacement of names in the specified path, while checking + for common mistakes such as naming a replacement that does nothing or forgetting a variable which + needs to be replaced. + + As with the [`--subst-var-by`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute-subst-var-by) + flag, names are encoded as `@name@` in the provided file at the provided path. + + Any unmatched variable names in the file at the provided path will cause a build failure. + + By default, any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement + has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them. + + # Inputs + + `src` ([Store Path](https://nixos.org/manual/nix/latest/store/store-path.html#store-path) String) + : The file in which to replace variables. + + `replacements` (AttrsOf String) + : Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) or + null to keep it unchanged. + + # Example + + ```nix + { replaceVars }: + + replaceVars ./greeting.txt { world = "hello"; } + ``` + + See `../../test/replace-vars/default.nix` for tests of this function. +*/ +src: replacements: replaceVarsWith { inherit src replacements; } diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index 697387f292ba..bb70a559fe96 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -9,6 +9,7 @@ import sys import tomllib from pathlib import Path from typing import Any, TypedDict, cast +from urllib.parse import unquote import requests from requests.adapters import HTTPAdapter, Retry @@ -21,6 +22,15 @@ def load_toml(path: Path) -> dict[str, Any]: return tomllib.load(f) +def get_lockfile_version(cargo_lock_toml: dict[str, Any]) -> int: + # lockfile v1 and v2 don't have the `version` key, so assume v2 + version = cargo_lock_toml.get("version", 2) + + # TODO: add logic for differentiating between v1 and v2 + + return version + + def download_file_with_checksum(url: str, destination_path: Path) -> str: retries = Retry( total=5, @@ -93,20 +103,29 @@ class GitSourceInfo(TypedDict): git_sha_rev: str -def parse_git_source(source: str) -> GitSourceInfo: +def parse_git_source(source: str, lockfile_version: int) -> GitSourceInfo: match = GIT_SOURCE_REGEX.match(source) if match is None: raise Exception(f"Unable to process git source: {source}.") - return cast(GitSourceInfo, match.groupdict(default=None)) + + source_info = cast(GitSourceInfo, match.groupdict(default=None)) + + # the source URL is URL-encoded in lockfile_version >=4 + # since we just used regex to parse it we have to manually decode the escaped branch/tag name + if lockfile_version >= 4 and source_info["value"] is not None: + source_info["value"] = unquote(source_info["value"]) + + return source_info def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: - cargo_toml = load_toml(lockfile_path) + cargo_lock_toml = load_toml(lockfile_path) + lockfile_version = get_lockfile_version(cargo_lock_toml) git_packages: list[dict[str, Any]] = [] registry_packages: list[dict[str, Any]] = [] - for pkg in cargo_toml["package"]: + for pkg in cargo_lock_toml["package"]: # ignore local dependenices if "source" not in pkg.keys(): eprint(f"Skipping local dependency: {pkg["name"]}") @@ -122,7 +141,7 @@ def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: git_sha_rev_to_url: dict[str, str] = {} for pkg in git_packages: - source_info = parse_git_source(pkg["source"]) + source_info = parse_git_source(pkg["source"], lockfile_version) git_sha_rev_to_url[source_info["git_sha_rev"]] = source_info["url"] out_dir.mkdir(exist_ok=True) @@ -207,7 +226,8 @@ def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: out_dir.mkdir(exist_ok=True) shutil.copy(lockfile_path, out_dir / "Cargo.lock") - cargo_toml = load_toml(lockfile_path) + cargo_lock_toml = load_toml(lockfile_path) + lockfile_version = get_lockfile_version(cargo_lock_toml) config_lines = [ '[source.vendored-sources]', @@ -217,7 +237,7 @@ def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: ] seen_source_keys = set() - for pkg in cargo_toml["package"]: + for pkg in cargo_lock_toml["package"]: # ignore local dependenices if "source" not in pkg.keys(): @@ -230,7 +250,8 @@ def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: if source.startswith("git+"): - source_info = parse_git_source(pkg["source"]) + source_info = parse_git_source(pkg["source"], lockfile_version) + git_sha_rev = source_info["git_sha_rev"] git_tree = vendor_staging_dir / "git" / git_sha_rev diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 2eab2124e70b..899fc9e32e21 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -12,6 +12,11 @@ maturinBuildHook() { pushd "${buildAndTestSubdir}" fi + # This is a huge hack, but it's the least invasive way + # to get the required interpreter name for maturin. + local interpreter_path="$(command -v python3 || command -v pypy3)" + local interpreter_name="$($interpreter_path -c 'import os; import sysconfig; print(os.path.basename(sysconfig.get_config_var('\''INCLUDEPY'\'')))')" + local flagsArray=( "--jobs=$NIX_BUILD_CORES" "--offline" @@ -20,6 +25,7 @@ maturinBuildHook() { "--strip" "--release" "--out" "$dist" + "--interpreter" "$interpreter_name" ) concatTo flagsArray maturinBuildFlags diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index e88931d0f383..b39b56f4ccb5 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -49,6 +49,10 @@ let parsedLockFile = builtins.fromTOML lockFileContents; + # lockfile v1 and v2 don't have the `version` key, so assume v2 + # we can implement more fine-grained detection later, if needed + lockFileVersion = parsedLockFile.version or 2; + packages = parsedLockFile.package; # There is no source attribute for the source package itself. But @@ -202,11 +206,20 @@ let # Cargo is happy with empty metadata. printf '{"files":{},"package":null}' > "$out/.cargo-checksum.json" + ${lib.optionalString (gitParts ? type) '' + gitPartsValue=${lib.escapeShellArg gitParts.value} + # starting with lockfile version v4 the git source url contains encoded query parameters + # our regex parser does not know how to unescape them to get the actual value, so we do it here + ${lib.optionalString (lockFileVersion >= 4) '' + gitPartsValue=$(${lib.getExe python3Packages.python} -c "import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))" "$gitPartsValue") + ''} + ''} + # Set up configuration for the vendor directory. cat > $out/.cargo-config <_maxx + 1; + | ^~ +--- a/src/aacurses.c ++++ b/src/aacurses.c +@@ -71,8 +71,8 @@ static void curses_getsize(aa_context * c, int *width, int *height) + { + if (__resized_curses) + curses_uninit(c), curses_init(&c->params, NULL,&c->driverparams, NULL), __resized_curses = 0; +- *width = stdscr->_maxx + 1; +- *height = stdscr->_maxy + 1; ++ *width = getmaxx(stdscr); ++ *height = getmaxy(stdscr); + #ifdef GPM_MOUSEDRIVER + gpm_mx = *width; + gpm_my = *height; diff --git a/pkgs/by-name/aa/aalib/package.nix b/pkgs/by-name/aa/aalib/package.nix index 2c644233d0ac..b6901e8950ac 100644 --- a/pkgs/by-name/aa/aalib/package.nix +++ b/pkgs/by-name/aa/aalib/package.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + patches = [ + # Fix implicit `int` on `main` error with newer versions of clang + ./clang.patch + # Fix build against opaque aalib API + ./ncurses-6.5.patch + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 4fae126d3c0d..7229e439666b 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -14,17 +14,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-J4W7ynJ5DpE97sILENNt6eya04aiq9DWBhlytsVmZHg="; + hash = "sha256-YlpR85jB6Il3UW4MTaf8pkilRVjkO0q/D/Yu+OiBX6Y="; }; proxyVendor = true; - vendorHash = "sha256-STQzc25gRozNHKjjYb8J8CL5WMhnx+nTJOGbuFmUYSU="; + vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo="; nativeBuildInputs = [ scdoc @@ -33,18 +33,13 @@ buildGoModule rec { patches = [ ./runtime-libexec.patch - - # patch to fix a encoding problem with gpg signed messages - (fetchpatch { - url = "https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch"; - hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM="; - }) ]; postPatch = '' substituteAllInPlace config/aerc.conf substituteAllInPlace config/config.go substituteAllInPlace doc/aerc-config.5.scd + substituteAllInPlace doc/aerc-templates.7.scd # Prevent buildGoModule from trying to build this rm contrib/linters.go diff --git a/pkgs/by-name/ae/aerc/runtime-libexec.patch b/pkgs/by-name/ae/aerc/runtime-libexec.patch index f8e8d0747048..684c0c26e8ea 100644 --- a/pkgs/by-name/ae/aerc/runtime-libexec.patch +++ b/pkgs/by-name/ae/aerc/runtime-libexec.patch @@ -1,8 +1,8 @@ diff --git a/config/aerc.conf b/config/aerc.conf -index 7d33b43..4315f0e 100644 +index fbc1f3ba..9eea2b81 100644 --- a/config/aerc.conf +++ b/config/aerc.conf -@@ -202,8 +202,7 @@ +@@ -301,8 +301,7 @@ # # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -12,7 +12,18 @@ index 7d33b43..4315f0e 100644 # #stylesets-dirs= -@@ -547,8 +546,7 @@ message/rfc822=colorize +@@ -741,8 +740,8 @@ + # ${XDG_DATA_HOME:-~/.local/share}/aerc/filters + # $PREFIX/libexec/aerc/filters + # $PREFIX/share/aerc/filters +-# /usr/libexec/aerc/filters +-# /usr/share/aerc/filters ++# @out@/libexec/aerc/filters ++# @out@/share/aerc/filters + # + # If you want to run a program in your default $PATH which has the same name + # as a builtin filter (e.g. /usr/bin/colorize), use its absolute path. +@@ -845,8 +844,7 @@ text/html=! html # # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -23,10 +34,10 @@ index 7d33b43..4315f0e 100644 #template-dirs= diff --git a/config/config.go b/config/config.go -index d70bcfe..c19e59a 100644 +index 14c4b233..9f305ffd 100644 --- a/config/config.go +++ b/config/config.go -@@ -54,10 +54,8 @@ func buildDefaultDirs() []string { +@@ -46,10 +46,8 @@ func buildDefaultDirs() []string { } // Add fixed fallback locations @@ -40,10 +51,19 @@ index d70bcfe..c19e59a 100644 return defaultDirs } diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 9e1f8a3..694abbc 100644 +index 1e3daaa9..cd118be0 100644 --- a/doc/aerc-config.5.scd +++ b/doc/aerc-config.5.scd -@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. +@@ -13,7 +13,7 @@ _aerc_, which defaults to _~/.config/aerc_. Alternate files can be specified via + command line arguments, see *aerc*(1). + + Examples of these config files are typically included with your installation of +-aerc and are usually installed in _/usr/share/aerc_. ++aerc and are usually installed in _@out@/share/aerc_. + + Each file uses the ini format, and consists of sections with keys and values. + A line beginning with _#_ is considered a comment and ignored, as are empty +@@ -386,8 +386,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -53,7 +73,36 @@ index 9e1f8a3..694abbc 100644 ``` *styleset-name* = __ -@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. +@@ -1019,7 +1018,7 @@ will be set to the terminal TTY. The filter is expected to implement its own + paging. + + aerc ships with some default filters installed in the libexec directory (usually +-_/usr/libexec/aerc/filters_). Note that these may have additional dependencies ++_@out@/libexec/aerc/filters_). Note that these may have additional dependencies + that aerc does not have alone. + + The filter commands are invoked with _sh -c command_. The following folders are +@@ -1031,8 +1030,8 @@ ${XDG_CONFIG_HOME:-~/.config}/aerc/filters + ${XDG_DATA_HOME:-~/.local/share}/aerc/filters + $PREFIX/libexec/aerc/filters + $PREFIX/share/aerc/filters +-/usr/libexec/aerc/filters +-/usr/share/aerc/filters ++@out@/libexec/aerc/filters ++@out@/share/aerc/filters + ``` + + If you want to run a program in your default *$PATH* which has the same +@@ -1370,7 +1369,7 @@ of the template name. The available symbols and functions are described in + *aerc-templates*(7). + + aerc ships with some default templates installed in the share directory (usually +-_/usr/share/aerc/templates_). ++_@out@/share/aerc/templates_). + + These options are configured in the *[templates]* section of _aerc.conf_. + +@@ -1382,8 +1381,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/templates ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -64,19 +113,19 @@ index 9e1f8a3..694abbc 100644 *new-message* = __ diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd -index ae9bc6d..5f42b14 100644 +index a6deb584..4f91869c 100644 --- a/doc/aerc-templates.7.scd +++ b/doc/aerc-templates.7.scd -@@ -319,7 +319,7 @@ aerc provides the following additional functions: - Execute external command, provide the second argument to its stdin. +@@ -398,7 +398,7 @@ aerc provides the following additional functions: + Attaches a file to the message being composed. ``` -- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}} -+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}} +- {{.Attach '/usr/libexec/aerc/filters/html'}} ++ {{.Attach '@out@/libexec/aerc/filters/html'}} ``` - *.Local* -@@ -425,7 +425,7 @@ aerc provides the following additional functions: + *exec* +@@ -581,7 +581,7 @@ aerc provides the following additional functions: ``` {{if eq .OriginalMIMEType "text/html"}} diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix index 6c7e2c516ff1..b9b9480d9ea1 100644 --- a/pkgs/by-name/al/almo/package.nix +++ b/pkgs/by-name/al/almo/package.nix @@ -5,18 +5,15 @@ gcc, python312Packages, }: -let - version = "0.9.5-alpha"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "almo"; - inherit version; + version = "0.9.6-alpha"; src = fetchFromGitHub { owner = "abap34"; repo = "almo"; - tag = "v${version}"; - sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-eNigZUeUz6ZjQsn+0S6+Orv0WoLbqGgoA3+wG5ZcSBI="; }; buildInputs = [ @@ -45,7 +42,8 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = lib.platforms.all; homepage = "https://github.com/abap34/almo"; + changelog = "https://github.com/abap34/almo/releases/tag/${finalAttrs.src.tag}"; maintainers = with lib.maintainers; [ momeemt ]; mainProgram = "almo"; }; -} +}) diff --git a/pkgs/by-name/al/alpine-make-rootfs/package.nix b/pkgs/by-name/al/alpine-make-rootfs/package.nix index c4c42b0acfcc..c16f44c6ad1f 100644 --- a/pkgs/by-name/al/alpine-make-rootfs/package.nix +++ b/pkgs/by-name/al/alpine-make-rootfs/package.nix @@ -16,13 +16,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "alpine-make-rootfs"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "alpinelinux"; repo = "alpine-make-rootfs"; rev = "v${version}"; - hash = "sha256-3j++mbQc6ozayZISgDFS9r35ovP0qLoflT6ahp8SUbc="; + hash = "sha256-sNqaMBtbklSBcKxsc3ROI30bE1PUzJJeZqLqC9p3H+U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 462f9d3eea16..9d727e8d21ab 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -3,14 +3,16 @@ fetchurl, lib, stdenv, + coreutils, + kmod, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; version = "1.2.12"; src = fetchurl { - url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2"; + url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2"; hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU="; }; @@ -19,6 +21,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + substituteInPlace ucm2/lib/card-init.conf \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" \ + --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" + + files=( + "ucm2/HDA/HDA.conf" + "ucm2/codecs/rt715/init.conf" + "ucm2/codecs/rt715-sdca/init.conf" + "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf" + "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf" + ) + + for file in "''${files[@]}"; do + substituteInPlace "$file" \ + --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' + done + mkdir -p $out/share/alsa cp -r ucm ucm2 $out/share/alsa @@ -29,7 +48,7 @@ stdenv.mkDerivation rec { url = "https://www.alsa-project.org/files/pub/lib/"; }; - meta = with lib; { + meta = { homepage = "https://www.alsa-project.org/"; description = "ALSA Use Case Manager configuration"; @@ -38,8 +57,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - license = licenses.bsd3; - maintainers = [ maintainers.roastiek ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.roastiek ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index f4e59d2af129..e669f75d5244 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.18.1"; + version = "7.19.1"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY="; + hash = "sha256-eT/HZDBDtOh9uQEffLhlBXfWuPSM/bnpgp5OFnSuCBk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 5a6135a4f3f9..58195f1454b9 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,15 +1,23 @@ -{ lib, fetchurl, appimageTools, makeWrapper, commandLineArgs ? "" }: +{ + lib, + fetchurl, + appimageTools, + makeWrapper, + nix-update-script, + commandLineArgs ? "", +}: let pname = "anytype"; - version = "0.43.8"; + version = "0.44.0"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-inqJvx5K/k97X50E0FYlzJDKqrVjAU6ZKIVdCWHr8NI="; + hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; nativeBuildInputs = [ makeWrapper ]; @@ -29,6 +37,17 @@ in appimageTools.wrapType2 { done ''; + passthru.updateScript = nix-update-script { + # Prevent updating to versions with '-' in them. + # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each + # {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a + # pre-release version. + extraArgs = [ + "--version-regex" + "[^-]*" + ]; + }; + meta = with lib; { description = "P2P note-taking tool"; homepage = "https://anytype.io/"; diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 65fa10a52e49..9610a01feb64 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.77.0-57419"; + version = "1.78.1-57736"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-euPJvD/BM0jVh3oBMsZNAZeyxTNRA4dmwIYNhwTjHoI="; + hash = "sha256-n81GMJ1Lhx8z/wwicyEKCbJM7WVi0mepSbefSXMuM3g="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index f8ba34710dcb..c5caee1a22e7 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -79,7 +79,7 @@ let hash = "sha256-zLWJOWcW7OYL32OwBm9VFtHbmG+ibhteRfHlKr9G3CQ="; }; - version = "18.0.0"; + version = "18.1.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-V2lOYOUJwXSvPPk2G17uc1eZO88EATHKwwDnEroBrPw="; + hash = "sha256-Jo3be5bVuDaDcSbW3pS8y9Wc2sz1W2tS6QTwf0XpODA"; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -103,6 +103,13 @@ stdenv.mkDerivation (finalAttrs: { includes = [ "src/arrow/buffer_test.cc" ]; hash = "sha256-ZHkznOilypi1J22d56PhLlw/hbz8RqwsOGDMqI1NsMs="; }) + # https://github.com/apache/arrow/pull/45057 remove on update + (fetchpatch { + name = "boost-187.patch"; + url = "https://github.com/apache/arrow/commit/5ec8b64668896ff06a86b6a41e700145324e1e34.patch"; + relative = "cpp"; + hash = "sha256-GkB7u4YnnaCApOMQPYFJuLdY7R2LtLzKccMEpKCO9ic="; + }) ]; # versions are all taken from diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 4dc3ff39490c..8cd89f3f13cb 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,21 +6,22 @@ installShellFiles, buildPackages, versionCheckHook, + nix-update-script, enableLegacySg ? false, }: rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; - rev = version; - hash = "sha256-oqG76KzyN5TnE27yxrHeEYjLwrnDMvwbOzOnN6TWvxc="; + tag = version; + hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q="; }; - cargoHash = "sha256-O3FKn90QVDk1TXJtjmaiDuXr+pwIjsAmadi+aypXeLA="; + cargoHash = "sha256-aCBEL+Jx4Kk7PWsxIgpdRdI7AnUAUEtRU4+JMxQ4Swk="; nativeBuildInputs = [ installShellFiles ]; @@ -72,13 +73,15 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { mainProgram = "ast-grep"; description = "Fast and polyglot tool for code searching, linting, rewriting at large scale"; homepage = "https://ast-grep.github.io/"; changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe montchr lord-valen diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index 5edb2d6366b8..cbae83d9d988 100644 --- a/pkgs/by-name/at/atf/package.nix +++ b/pkgs/by-name/at/atf/package.nix @@ -10,33 +10,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "atf"; - version = "0.21-unstable-2021-09-01"; # Match the commit used in FreeBSD’s port. + version = "0.22"; src = fetchFromGitHub { owner = "freebsd"; repo = "atf"; - rev = "55c21b2c5fb189bbdfccb2b297bfa89236502542"; - hash = "sha256-u0YBPcoIBvqBVaytaO9feBaRnQygtzEPGJV0ItI1Vco="; + tag = "atf-${finalAttrs.version}"; + hash = "sha256-vZfBk/lH+04d3NbTUYjAaxwGFHtnagl/kY04hgkE4Iw="; }; patches = [ - # Fixes use after free that causes failures in Kyua’s test suite. - # https://github.com/freebsd/atf/pull/57 - # https://github.com/freebsd/kyua/issues/223 + # https://github.com/freebsd/atf/issues/88 + # https://github.com/freebsd/atf/pull/85 + # Maintainer say it fix some tests in issue 88. + ./pr-85.patch (fetchpatch { - name = "fix-use-after-free.patch"; - url = "https://github.com/freebsd/atf/commit/fb22f3837bcfdce5ce8b3c0e18af131bb6902a02.patch"; - hash = "sha256-p4L3sxSYfMSzwKrUDlEZpoJydbaK3Hcbvn90KlPHkic="; + url = "https://github.com/freebsd/atf/commit/b42c98612cb99fa3f52766a46203263dc1de7187.patch?full_index=1"; + hash = "sha256-goDPIdIF8vHXDengVIYbxw5W/JT5kfsG5japgtranas="; }) ]; postPatch = lib.optionalString finalAttrs.doInstallCheck '' - # https://github.com/freebsd/atf/issues/61 - substituteInPlace atf-c/check_test.c \ - --replace-fail 'ATF_TP_ADD_TC(tp, build_cpp)' "" - substituteInPlace atf-c++/check_test.cpp \ - --replace-fail 'ATF_ADD_TEST_CASE(tcs, build_cpp);' "" # Can’t find `c_helpers` in the work folder. substituteInPlace test-programs/Kyuafile \ --replace-fail 'atf_test_program{name="srcdir_test"}' "" @@ -60,12 +55,14 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ # ATF isn’t compatible with C++17, which is the default on current clang and GCC. - "CXXFLAGS=-std=c++11" + "CXXFLAGS=-std=c++14" ]; doInstallCheck = true; - nativeInstallCheckInputs = [ kyua ]; + nativeInstallCheckInputs = [ + kyua + ]; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/at/atf/pr-85.patch b/pkgs/by-name/at/atf/pr-85.patch new file mode 100644 index 000000000000..d438ce16b048 --- /dev/null +++ b/pkgs/by-name/at/atf/pr-85.patch @@ -0,0 +1,1529 @@ +From 1f0ee71c000074ca48c2d9edc94f152747835e20 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Thu, 5 Dec 2024 23:07:18 -0800 +Subject: [PATCH 1/9] Garbage collect stray reference to auto_array + +This entry should have been removed in the referenced commit. + +Fixes: 6639d083e7d5b4b478397cc416cd42a756d17b0c +--- + atf-c++/detail/Makefile.am.inc | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/atf-c++/detail/Makefile.am.inc b/atf-c++/detail/Makefile.am.inc +index b3181346..29b41c3f 100644 +--- a/atf-c++/detail/Makefile.am.inc ++++ b/atf-c++/detail/Makefile.am.inc +@@ -25,7 +25,6 @@ + + libatf_c___la_SOURCES += atf-c++/detail/application.cpp \ + atf-c++/detail/application.hpp \ +- atf-c++/detail/auto_array.hpp \ + atf-c++/detail/env.cpp \ + atf-c++/detail/env.hpp \ + atf-c++/detail/exceptions.cpp \ + +From bb58a4dfbc98e95c365be8033f9778571f35ef9d Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Thu, 5 Dec 2024 23:25:26 -0800 +Subject: [PATCH 2/9] Require C++-14 at bare minimum + +This change imports ac_cxx_compile_stdcxx.m4 from gnu,org and makes use +of the `AX_CXX_COMPILE_STDCXX` macro in configure.ac to ensure that the +compiler specified supports C++-14 (at bare minimum). This is being done +to quell some issues reported by scan-build about the code using C++ +range-based for-loops (a feature added in C++-11). +--- + configure.ac | 3 +- + m4/ac_cxx_compile_stdcxx.m4 | 1070 +++++++++++++++++++++++++++++++++++ + 2 files changed, 1072 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_cxx_compile_stdcxx.m4 + +diff --git a/configure.ac b/configure.ac +index c37aca44..6d802144 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,8 +58,9 @@ AM_PROG_CC_C_O + dnl The C compiler check automatically aborts if the compiler does not work. + dnl Nothing to do here. + +-AC_LANG(C++) + AC_PROG_CXX ++AC_LANG_COMPILER(C++) ++AX_CXX_COMPILE_STDCXX(14, noext, mandatory) + AC_CACHE_CHECK([whether the C++ compiler works], + [atf_cv_prog_cxx_works], + [AC_LANG_PUSH([C++]) +diff --git a/m4/ac_cxx_compile_stdcxx.m4 b/m4/ac_cxx_compile_stdcxx.m4 +new file mode 100644 +index 00000000..fe6ae17e +--- /dev/null ++++ b/m4/ac_cxx_compile_stdcxx.m4 +@@ -0,0 +1,1070 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the specified ++# version of the C++ standard. If necessary, add switches to CXX and ++# CXXCPP to enable support. VERSION may be '11', '14', '17', '20', or ++# '23' for the respective C++ standard version. ++# ++# The second argument, if specified, indicates whether you insist on an ++# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. ++# -std=c++11). If neither is specified, you get whatever works, with ++# preference for no added switch, and then for an extended mode. ++# ++# The third argument, if specified 'mandatory' or if left unspecified, ++# indicates that baseline support for the specified C++ standard is ++# required and that the macro should error out if no mode with that ++# support is found. If specified 'optional', then configuration proceeds ++# regardless, after defining HAVE_CXX${VERSION} if and only if a ++# supporting mode is found. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# Copyright (c) 2016, 2018 Krzesimir Nowak ++# Copyright (c) 2019 Enji Cooper ++# Copyright (c) 2020 Jason Merrill ++# Copyright (c) 2021, 2024 Jörn Heusipp ++# Copyright (c) 2015, 2022, 2023, 2024 Olly Betts ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 25 ++ ++dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro ++dnl (serial version number 13). ++ ++AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl ++ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], ++ [$1], [14], [ax_cxx_compile_alternatives="14 1y"], ++ [$1], [17], [ax_cxx_compile_alternatives="17 1z"], ++ [$1], [20], [ax_cxx_compile_alternatives="20"], ++ [$1], [23], [ax_cxx_compile_alternatives="23"], ++ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$2], [], [], ++ [$2], [ext], [], ++ [$2], [noext], [], ++ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [optional], [ax_cxx_compile_cxx$1_required=false], ++ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) ++ AC_LANG_PUSH([C++])dnl ++ ac_success=no ++ ++ m4_if([$2], [], [dnl ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, ++ ax_cv_cxx_compile_cxx$1, ++ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [ax_cv_cxx_compile_cxx$1=yes], ++ [ax_cv_cxx_compile_cxx$1=no])]) ++ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then ++ ac_success=yes ++ fi]) ++ ++ m4_if([$2], [noext], [], [dnl ++ if test x$ac_success = xno; then ++ for alternative in ${ax_cxx_compile_alternatives}; do ++ switch="-std=gnu++${alternative}" ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXX="$CXX" ++ CXX="$CXX $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXX="$ac_save_CXX"]) ++ if eval test x\$$cachevar = xyes; then ++ CXX="$CXX $switch" ++ if test -n "$CXXCPP" ; then ++ CXXCPP="$CXXCPP $switch" ++ fi ++ ac_success=yes ++ break ++ fi ++ done ++ fi]) ++ ++ m4_if([$2], [ext], [], [dnl ++ if test x$ac_success = xno; then ++ dnl HP's aCC needs +std=c++11 according to: ++ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf ++ dnl Cray's crayCC needs "-h std=c++11" ++ dnl MSVC needs -std:c++NN for C++17 and later (default is C++14) ++ for alternative in ${ax_cxx_compile_alternatives}; do ++ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do ++ if test x"$switch" = xMSVC; then ++ dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide ++ dnl with -std=c++17. We suffix the cache variable name with _MSVC to ++ dnl avoid this. ++ switch=-std:c++${alternative} ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC]) ++ else ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ fi ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXX="$CXX" ++ CXX="$CXX $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXX="$ac_save_CXX"]) ++ if eval test x\$$cachevar = xyes; then ++ CXX="$CXX $switch" ++ if test -n "$CXXCPP" ; then ++ CXXCPP="$CXXCPP $switch" ++ fi ++ ac_success=yes ++ break ++ fi ++ done ++ if test x$ac_success = xyes; then ++ break ++ fi ++ done ++ fi]) ++ AC_LANG_POP([C++]) ++ if test x$ax_cxx_compile_cxx$1_required = xtrue; then ++ if test x$ac_success = xno; then ++ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) ++ fi ++ fi ++ if test x$ac_success = xno; then ++ HAVE_CXX$1=0 ++ AC_MSG_NOTICE([No compiler with C++$1 support was found]) ++ else ++ HAVE_CXX$1=1 ++ AC_DEFINE(HAVE_CXX$1,1, ++ [define if the compiler supports basic C++$1 syntax]) ++ fi ++ AC_SUBST(HAVE_CXX$1) ++]) ++ ++ ++dnl Test body for checking C++11 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], ++ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11] ++) ++ ++dnl Test body for checking C++14 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], ++ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14] ++) ++ ++dnl Test body for checking C++17 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], ++ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17] ++) ++ ++dnl Test body for checking C++20 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20], ++ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_20] ++) ++ ++dnl Test body for checking C++23 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_23], ++ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_23] ++) ++ ++ ++dnl Tests for new features in C++11 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ ++ ++// If the compiler admits that it is not ready for C++11, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++// MSVC always sets __cplusplus to 199711L in older versions; newer versions ++// only set it correctly if /Zc:__cplusplus is specified as well as a ++// /std:c++NN switch: ++// ++// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ ++// ++// The value __cplusplus ought to have is available in _MSVC_LANG since ++// Visual Studio 2015 Update 3: ++// ++// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros ++// ++// This was also the first MSVC version to support C++14 so we can't use the ++// value of either __cplusplus or _MSVC_LANG to quickly rule out MSVC having ++// C++11 or C++14 support, but we can check _MSVC_LANG for C++17 and later. ++#elif __cplusplus < 201103L && !defined _MSC_VER ++ ++#error "This is not a C++11 compiler" ++ ++#else ++ ++namespace cxx11 ++{ ++ ++ namespace test_static_assert ++ { ++ ++ template ++ struct check ++ { ++ static_assert(sizeof(int) <= sizeof(T), "not big enough"); ++ }; ++ ++ } ++ ++ namespace test_final_override ++ { ++ ++ struct Base ++ { ++ virtual ~Base() {} ++ virtual void f() {} ++ }; ++ ++ struct Derived : public Base ++ { ++ virtual ~Derived() override {} ++ virtual void f() override {} ++ }; ++ ++ } ++ ++ namespace test_double_right_angle_brackets ++ { ++ ++ template < typename T > ++ struct check {}; ++ ++ typedef check single_type; ++ typedef check> double_type; ++ typedef check>> triple_type; ++ typedef check>>> quadruple_type; ++ ++ } ++ ++ namespace test_decltype ++ { ++ ++ int ++ f() ++ { ++ int a = 1; ++ decltype(a) b = 2; ++ return a + b; ++ } ++ ++ } ++ ++ namespace test_type_deduction ++ { ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static const bool value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static const bool value = true; ++ }; ++ ++ template < typename T1, typename T2 > ++ auto ++ add(T1 a1, T2 a2) -> decltype(a1 + a2) ++ { ++ return a1 + a2; ++ } ++ ++ int ++ test(const int c, volatile int v) ++ { ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == false, ""); ++ auto ac = c; ++ auto av = v; ++ auto sumi = ac + av + 'x'; ++ auto sumf = ac + av + 1.0; ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == true, ""); ++ return (sumf > 0.0) ? sumi : add(c, v); ++ } ++ ++ } ++ ++ namespace test_noexcept ++ { ++ ++ int f() { return 0; } ++ int g() noexcept { return 0; } ++ ++ static_assert(noexcept(f()) == false, ""); ++ static_assert(noexcept(g()) == true, ""); ++ ++ } ++ ++ namespace test_constexpr ++ { ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept ++ { ++ return *s ? strlen_c_r(s + 1, acc + 1) : acc; ++ } ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c(const CharT *const s) noexcept ++ { ++ return strlen_c_r(s, 0UL); ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("1") == 1UL, ""); ++ static_assert(strlen_c("example") == 7UL, ""); ++ static_assert(strlen_c("another\0example") == 7UL, ""); ++ ++ } ++ ++ namespace test_rvalue_references ++ { ++ ++ template < int N > ++ struct answer ++ { ++ static constexpr int value = N; ++ }; ++ ++ answer<1> f(int&) { return answer<1>(); } ++ answer<2> f(const int&) { return answer<2>(); } ++ answer<3> f(int&&) { return answer<3>(); } ++ ++ void ++ test() ++ { ++ int i = 0; ++ const int c = 0; ++ static_assert(decltype(f(i))::value == 1, ""); ++ static_assert(decltype(f(c))::value == 2, ""); ++ static_assert(decltype(f(0))::value == 3, ""); ++ } ++ ++ } ++ ++ namespace test_uniform_initialization ++ { ++ ++ struct test ++ { ++ static const int zero {}; ++ static const int one {1}; ++ }; ++ ++ static_assert(test::zero == 0, ""); ++ static_assert(test::one == 1, ""); ++ ++ } ++ ++ namespace test_lambdas ++ { ++ ++ void ++ test1() ++ { ++ auto lambda1 = [](){}; ++ auto lambda2 = lambda1; ++ lambda1(); ++ lambda2(); ++ } ++ ++ int ++ test2() ++ { ++ auto a = [](int i, int j){ return i + j; }(1, 2); ++ auto b = []() -> int { return '0'; }(); ++ auto c = [=](){ return a + b; }(); ++ auto d = [&](){ return c; }(); ++ auto e = [a, &b](int x) mutable { ++ const auto identity = [](int y){ return y; }; ++ for (auto i = 0; i < a; ++i) ++ a += b--; ++ return x + identity(a + b); ++ }(0); ++ return a + b + c + d + e; ++ } ++ ++ int ++ test3() ++ { ++ const auto nullary = [](){ return 0; }; ++ const auto unary = [](int x){ return x; }; ++ using nullary_t = decltype(nullary); ++ using unary_t = decltype(unary); ++ const auto higher1st = [](nullary_t f){ return f(); }; ++ const auto higher2nd = [unary](nullary_t f1){ ++ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; ++ }; ++ return higher1st(nullary) + higher2nd(nullary)(unary); ++ } ++ ++ } ++ ++ namespace test_variadic_templates ++ { ++ ++ template ++ struct sum; ++ ++ template ++ struct sum ++ { ++ static constexpr auto value = N0 + sum::value; ++ }; ++ ++ template <> ++ struct sum<> ++ { ++ static constexpr auto value = 0; ++ }; ++ ++ static_assert(sum<>::value == 0, ""); ++ static_assert(sum<1>::value == 1, ""); ++ static_assert(sum<23>::value == 23, ""); ++ static_assert(sum<1, 2>::value == 3, ""); ++ static_assert(sum<5, 5, 11>::value == 21, ""); ++ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); ++ ++ } ++ ++ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae ++ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function ++ // because of this. ++ namespace test_template_alias_sfinae ++ { ++ ++ struct foo {}; ++ ++ template ++ using member = typename T::member_type; ++ ++ template ++ void func(...) {} ++ ++ template ++ void func(member*) {} ++ ++ void test(); ++ ++ void test() { func(0); } ++ ++ } ++ ++} // namespace cxx11 ++ ++#endif // __cplusplus >= 201103L ++ ++]]) ++ ++ ++dnl Tests for new features in C++14 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ ++ ++// If the compiler admits that it is not ready for C++14, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif __cplusplus < 201402L && !defined _MSC_VER ++ ++#error "This is not a C++14 compiler" ++ ++#else ++ ++namespace cxx14 ++{ ++ ++ namespace test_polymorphic_lambdas ++ { ++ ++ int ++ test() ++ { ++ const auto lambda = [](auto&&... args){ ++ const auto istiny = [](auto x){ ++ return (sizeof(x) == 1UL) ? 1 : 0; ++ }; ++ const int aretiny[] = { istiny(args)... }; ++ return aretiny[0]; ++ }; ++ return lambda(1, 1L, 1.0f, '1'); ++ } ++ ++ } ++ ++ namespace test_binary_literals ++ { ++ ++ constexpr auto ivii = 0b0000000000101010; ++ static_assert(ivii == 42, "wrong value"); ++ ++ } ++ ++ namespace test_generalized_constexpr ++ { ++ ++ template < typename CharT > ++ constexpr unsigned long ++ strlen_c(const CharT *const s) noexcept ++ { ++ auto length = 0UL; ++ for (auto p = s; *p; ++p) ++ ++length; ++ return length; ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("x") == 1UL, ""); ++ static_assert(strlen_c("test") == 4UL, ""); ++ static_assert(strlen_c("another\0test") == 7UL, ""); ++ ++ } ++ ++ namespace test_lambda_init_capture ++ { ++ ++ int ++ test() ++ { ++ auto x = 0; ++ const auto lambda1 = [a = x](int b){ return a + b; }; ++ const auto lambda2 = [a = lambda1(x)](){ return a; }; ++ return lambda2(); ++ } ++ ++ } ++ ++ namespace test_digit_separators ++ { ++ ++ constexpr auto ten_million = 100'000'000; ++ static_assert(ten_million == 100000000, ""); ++ ++ } ++ ++ namespace test_return_type_deduction ++ { ++ ++ auto f(int& x) { return x; } ++ decltype(auto) g(int& x) { return x; } ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static constexpr auto value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static constexpr auto value = true; ++ }; ++ ++ int ++ test() ++ { ++ auto x = 0; ++ static_assert(is_same::value, ""); ++ static_assert(is_same::value, ""); ++ return x; ++ } ++ ++ } ++ ++} // namespace cxx14 ++ ++#endif // __cplusplus >= 201402L ++ ++]]) ++ ++ ++dnl Tests for new features in C++17 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ ++ ++// If the compiler admits that it is not ready for C++17, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L ++ ++#error "This is not a C++17 compiler" ++ ++#else ++ ++#include ++#include ++#include ++ ++namespace cxx17 ++{ ++ ++ namespace test_constexpr_lambdas ++ { ++ ++ constexpr int foo = [](){return 42;}(); ++ ++ } ++ ++ namespace test::nested_namespace::definitions ++ { ++ ++ } ++ ++ namespace test_fold_expression ++ { ++ ++ template ++ int multiply(Args... args) ++ { ++ return (args * ... * 1); ++ } ++ ++ template ++ bool all(Args... args) ++ { ++ return (args && ...); ++ } ++ ++ } ++ ++ namespace test_extended_static_assert ++ { ++ ++ static_assert (true); ++ ++ } ++ ++ namespace test_auto_brace_init_list ++ { ++ ++ auto foo = {5}; ++ auto bar {5}; ++ ++ static_assert(std::is_same, decltype(foo)>::value); ++ static_assert(std::is_same::value); ++ } ++ ++ namespace test_typename_in_template_template_parameter ++ { ++ ++ template typename X> struct D; ++ ++ } ++ ++ namespace test_fallthrough_nodiscard_maybe_unused_attributes ++ { ++ ++ int f1() ++ { ++ return 42; ++ } ++ ++ [[nodiscard]] int f2() ++ { ++ [[maybe_unused]] auto unused = f1(); ++ ++ switch (f1()) ++ { ++ case 17: ++ f1(); ++ [[fallthrough]]; ++ case 42: ++ f1(); ++ } ++ return f1(); ++ } ++ ++ } ++ ++ namespace test_extended_aggregate_initialization ++ { ++ ++ struct base1 ++ { ++ int b1, b2 = 42; ++ }; ++ ++ struct base2 ++ { ++ base2() { ++ b3 = 42; ++ } ++ int b3; ++ }; ++ ++ struct derived : base1, base2 ++ { ++ int d; ++ }; ++ ++ derived d1 {{1, 2}, {}, 4}; // full initialization ++ derived d2 {{}, {}, 4}; // value-initialized bases ++ ++ } ++ ++ namespace test_general_range_based_for_loop ++ { ++ ++ struct iter ++ { ++ int i; ++ ++ int& operator* () ++ { ++ return i; ++ } ++ ++ const int& operator* () const ++ { ++ return i; ++ } ++ ++ iter& operator++() ++ { ++ ++i; ++ return *this; ++ } ++ }; ++ ++ struct sentinel ++ { ++ int i; ++ }; ++ ++ bool operator== (const iter& i, const sentinel& s) ++ { ++ return i.i == s.i; ++ } ++ ++ bool operator!= (const iter& i, const sentinel& s) ++ { ++ return !(i == s); ++ } ++ ++ struct range ++ { ++ iter begin() const ++ { ++ return {0}; ++ } ++ ++ sentinel end() const ++ { ++ return {5}; ++ } ++ }; ++ ++ void f() ++ { ++ range r {}; ++ ++ for (auto i : r) ++ { ++ [[maybe_unused]] auto v = i; ++ } ++ } ++ ++ } ++ ++ namespace test_lambda_capture_asterisk_this_by_value ++ { ++ ++ struct t ++ { ++ int i; ++ int foo() ++ { ++ return [*this]() ++ { ++ return i; ++ }(); ++ } ++ }; ++ ++ } ++ ++ namespace test_enum_class_construction ++ { ++ ++ enum class byte : unsigned char ++ {}; ++ ++ byte foo {42}; ++ ++ } ++ ++ namespace test_constexpr_if ++ { ++ ++ template ++ int f () ++ { ++ if constexpr(cond) ++ { ++ return 13; ++ } ++ else ++ { ++ return 42; ++ } ++ } ++ ++ } ++ ++ namespace test_selection_statement_with_initializer ++ { ++ ++ int f() ++ { ++ return 13; ++ } ++ ++ int f2() ++ { ++ if (auto i = f(); i > 0) ++ { ++ return 3; ++ } ++ ++ switch (auto i = f(); i + 4) ++ { ++ case 17: ++ return 2; ++ ++ default: ++ return 1; ++ } ++ } ++ ++ } ++ ++ namespace test_template_argument_deduction_for_class_templates ++ { ++ ++ template ++ struct pair ++ { ++ pair (T1 p1, T2 p2) ++ : m1 {p1}, ++ m2 {p2} ++ {} ++ ++ T1 m1; ++ T2 m2; ++ }; ++ ++ void f() ++ { ++ [[maybe_unused]] auto p = pair{13, 42u}; ++ } ++ ++ } ++ ++ namespace test_non_type_auto_template_parameters ++ { ++ ++ template ++ struct B ++ {}; ++ ++ B<5> b1; ++ B<'a'> b2; ++ ++ } ++ ++ namespace test_structured_bindings ++ { ++ ++ int arr[2] = { 1, 2 }; ++ std::pair pr = { 1, 2 }; ++ ++ auto f1() -> int(&)[2] ++ { ++ return arr; ++ } ++ ++ auto f2() -> std::pair& ++ { ++ return pr; ++ } ++ ++ struct S ++ { ++ int x1 : 2; ++ volatile double y1; ++ }; ++ ++ S f3() ++ { ++ return {}; ++ } ++ ++ auto [ x1, y1 ] = f1(); ++ auto& [ xr1, yr1 ] = f1(); ++ auto [ x2, y2 ] = f2(); ++ auto& [ xr2, yr2 ] = f2(); ++ const auto [ x3, y3 ] = f3(); ++ ++ } ++ ++ namespace test_exception_spec_type_system ++ { ++ ++ struct Good {}; ++ struct Bad {}; ++ ++ void g1() noexcept; ++ void g2(); ++ ++ template ++ Bad ++ f(T*, T*); ++ ++ template ++ Good ++ f(T1*, T2*); ++ ++ static_assert (std::is_same_v); ++ ++ } ++ ++ namespace test_inline_variables ++ { ++ ++ template void f(T) ++ {} ++ ++ template inline T g(T) ++ { ++ return T{}; ++ } ++ ++ template<> inline void f<>(int) ++ {} ++ ++ template<> int g<>(int) ++ { ++ return 5; ++ } ++ ++ } ++ ++} // namespace cxx17 ++ ++#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L ++ ++]]) ++ ++ ++dnl Tests for new features in C++20 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[ ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L ++ ++#error "This is not a C++20 compiler" ++ ++#else ++ ++#include ++ ++namespace cxx20 ++{ ++ ++// As C++20 supports feature test macros in the standard, there is no ++// immediate need to actually test for feature availability on the ++// Autoconf side. ++ ++} // namespace cxx20 ++ ++#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L ++ ++]]) ++ ++ ++dnl Tests for new features in C++23 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_23], [[ ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L ++ ++#error "This is not a C++23 compiler" ++ ++#else ++ ++#include ++ ++namespace cxx23 ++{ ++ ++// As C++23 supports feature test macros in the standard, there is no ++// immediate need to actually test for feature availability on the ++// Autoconf side. ++ ++} // namespace cxx23 ++ ++#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L ++ ++]]) + +From e00b7f9250e0b7dae44e6b9191be0aa31d8cb668 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Sat, 7 Dec 2024 18:18:02 -0800 +Subject: [PATCH 3/9] Stop shipping atf-*-api(3) manpages + +These manpages have been deprecated for at least a release. Remove them +and all of the logic associated with them. + +Signed-off-by: Enji Cooper +--- + Makefile.am | 8 -------- + configure.ac | 3 --- + 2 files changed, 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 913910c2..d202fd1d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -114,12 +114,4 @@ clean-all: + + .PHONY: $(PHONY_TARGETS) + +-# TODO(jmmv): Remove after atf 0.22. +-install-data-hook: +- cd $(DESTDIR)$(man3dir) && \ +- for binding in c c++ sh; do \ +- rm -f "atf-$${binding}-api.3"; \ +- $(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \ +- done +- + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 +diff --git a/configure.ac b/configure.ac +index 6d802144..a2d68cee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,9 +74,6 @@ fi + + KYUA_DEVELOPER_MODE([C,C++]) + +-dnl TODO(jmmv): Remove once the atf-*-api.3 symlinks are removed. +-AC_PROG_LN_S +- + ATF_MODULE_APPLICATION + ATF_MODULE_DEFS + ATF_MODULE_ENV + +From aa0fe99ef3de0f31dbaefb5268015258478d0ba4 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Sat, 7 Dec 2024 18:20:47 -0800 +Subject: [PATCH 4/9] Expose WCOREDUMP(..) in a deterministic manner + +WCOREDUMP is considered an extension to the POSIX spec on multiple +platforms, and thus is not automatically exposed on all platforms. Add the +relevant preprocessor defines to config.h via autoconf, then leverage them +in atf-c(3). + +This helps ensure that the platforms which support WCOREDUMP properly +expose the macro. + +Signed-off-by: Enji Cooper +--- + atf-c/detail/process.c | 2 ++ + configure.ac | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/atf-c/detail/process.c b/atf-c/detail/process.c +index 567d28ec..84bb4882 100644 +--- a/atf-c/detail/process.c ++++ b/atf-c/detail/process.c +@@ -23,6 +23,8 @@ + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + ++#include "config.h" ++ + #include "atf-c/detail/process.h" + + #include +diff --git a/configure.ac b/configure.ac +index a2d68cee..3a88354b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,6 +58,8 @@ AM_PROG_CC_C_O + dnl The C compiler check automatically aborts if the compiler does not work. + dnl Nothing to do here. + ++AC_USE_SYSTEM_EXTENSIONS ++ + AC_PROG_CXX + AC_LANG_COMPILER(C++) + AX_CXX_COMPILE_STDCXX(14, noext, mandatory) + +From deee8f2628847e3fff6fd2af04f163fadee4c61c Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Tue, 10 Dec 2024 14:26:58 -0800 +Subject: [PATCH 5/9] Add compiler feature detection for + `__attribute__((nonnull))` + +This feature is being detected so several functions can be appropriately +marked as taking non-NULL/-nullptr parameters, and the compiler and static +analyzers can (in turn) make intelligent decisions when optimizing and +analyzing code, respectively. + +Signed-off-by: Enji Cooper +--- + atf-c/defs.h.in | 1 + + m4/module-defs.m4 | 21 +++++++++++++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/atf-c/defs.h.in b/atf-c/defs.h.in +index 6059e7fd..5346e56a 100644 +--- a/atf-c/defs.h.in ++++ b/atf-c/defs.h.in +@@ -27,6 +27,7 @@ + #define ATF_C_DEFS_H + + #define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ ++#define ATF_DEFS_ATTRIBUTE_NONNULL @ATTRIBUTE_NONNULL@ + #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ + #define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@ + +diff --git a/m4/module-defs.m4 b/m4/module-defs.m4 +index b1c9cc84..feb3df27 100644 +--- a/m4/module-defs.m4 ++++ b/m4/module-defs.m4 +@@ -54,6 +54,26 @@ test_printf(const char *format, ...) + AC_SUBST([ATTRIBUTE_FORMAT_PRINTF], [${value}]) + ]) + ++AC_DEFUN([ATF_ATTRIBUTE_NONNULL], [ ++ AC_CACHE_CHECK( ++ [whether __attribute__((nonnull)) is supported], ++ [kyua_cv_attribute_nonnull], [ ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([ ++void func(char *foo __attribute__((nonnull))); ++])], ++ [kyua_cv_attribute_nonnull=yes], ++ [kyua_cv_attribute_nonnull=no]) ++ ]) ++ if test x"${kyua_cv_attribute_nonnull}" = xyes; then ++ value="__attribute__((nonnull))" ++ else ++ value="" ++ fi ++ AC_SUBST([ATTRIBUTE_NONNULL], [${value}]) ++]) ++ ++ + AC_DEFUN([ATF_ATTRIBUTE_NORETURN], [ + dnl XXX This check is overly simple and should be fixed. For example, + dnl Sun's cc does support the noreturn attribute but CC (the C++ +@@ -103,6 +123,7 @@ function(int a __attribute__((__unused__))) + + AC_DEFUN([ATF_MODULE_DEFS], [ + ATF_ATTRIBUTE_FORMAT_PRINTF ++ ATF_ATTRIBUTE_NONNULL + ATF_ATTRIBUTE_NORETURN + ATF_ATTRIBUTE_UNUSED + ]) + +From 1ca4688b87e8bcb3bfc5c05ef61b385d59019383 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Wed, 25 Dec 2024 11:31:12 -0800 +Subject: [PATCH 6/9] Restore AC_PROG_CPP + +This was accidentally deleted post-0.21 release. It's still needed by +tests and build infrastructure. + +Signed-off-by: Enji Cooper +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 3a88354b..e42ee5e1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,6 +62,7 @@ AC_USE_SYSTEM_EXTENSIONS + + AC_PROG_CXX + AC_LANG_COMPILER(C++) ++AC_PROG_CPP + AX_CXX_COMPILE_STDCXX(14, noext, mandatory) + AC_CACHE_CHECK([whether the C++ compiler works], + [atf_cv_prog_cxx_works], + +From bff968f5a164a81819046c55881e6083a7607dcf Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Sat, 7 Dec 2024 18:12:02 -0800 +Subject: [PATCH 7/9] atf-c/detail/env.c: remove unnecessary complexity + +The libcalls used have been in the POSIX standard since 2008.1. Require +them to be present instead of conditionally hoping they're present. + +This fixes an issue where the autoconf code was messing up with a +combination of clang tools, which resulted in the autoconf code failing +to properly determine whether or not the functions were available. + +Signed-off-by: Enji Cooper +--- + atf-c/detail/env.c | 41 +++-------------------------------------- + configure.ac | 1 - + m4/module-env.m4 | 28 ---------------------------- + 3 files changed, 3 insertions(+), 67 deletions(-) + delete mode 100644 m4/module-env.m4 + +diff --git a/atf-c/detail/env.c b/atf-c/detail/env.c +index 8ee3d697..36de217c 100644 +--- a/atf-c/detail/env.c ++++ b/atf-c/detail/env.c +@@ -25,10 +25,6 @@ + + #include "atf-c/detail/env.h" + +-#if defined(HAVE_CONFIG_H) +-#include "config.h" +-#endif +- + #include + #include + +@@ -65,25 +61,11 @@ atf_env_set(const char *name, const char *val) + { + atf_error_t err; + +-#if defined(HAVE_SETENV) + if (setenv(name, val, 1) == -1) +- err = atf_libc_error(errno, "Cannot set environment variable " +- "'%s' to '%s'", name, val); ++ err = atf_libc_error(errno, ++ "Cannot set environment variable '%s' to '%s'", name, val); + else + err = atf_no_error(); +-#elif defined(HAVE_PUTENV) +- char *buf; +- +- err = atf_text_format(&buf, "%s=%s", name, val); +- if (!atf_is_error(err)) { +- if (putenv(buf) == -1) +- err = atf_libc_error(errno, "Cannot set environment variable " +- "'%s' to '%s'", name, val); +- free(buf); +- } +-#else +-# error "Don't know how to set an environment variable." +-#endif + + return err; + } +@@ -91,24 +73,7 @@ atf_env_set(const char *name, const char *val) + atf_error_t + atf_env_unset(const char *name) + { +- atf_error_t err; + +-#if defined(HAVE_UNSETENV) + unsetenv(name); +- err = atf_no_error(); +-#elif defined(HAVE_PUTENV) +- char *buf; +- +- err = atf_text_format(&buf, "%s=", name); +- if (!atf_is_error(err)) { +- if (putenv(buf) == -1) +- err = atf_libc_error(errno, "Cannot unset environment variable" +- " '%s'", name); +- free(buf); +- } +-#else +-# error "Don't know how to unset an environment variable." +-#endif +- +- return err; ++ return (atf_no_error()); + } +diff --git a/configure.ac b/configure.ac +index e42ee5e1..00ee124c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,6 @@ KYUA_DEVELOPER_MODE([C,C++]) + + ATF_MODULE_APPLICATION + ATF_MODULE_DEFS +-ATF_MODULE_ENV + ATF_MODULE_FS + + ATF_RUNTIME_TOOL([ATF_BUILD_CC], +diff --git a/m4/module-env.m4 b/m4/module-env.m4 +deleted file mode 100644 +index 963aab38..00000000 +--- a/m4/module-env.m4 ++++ /dev/null +@@ -1,28 +0,0 @@ +-dnl Copyright (c) 2007 The NetBSD Foundation, Inc. +-dnl All rights reserved. +-dnl +-dnl Redistribution and use in source and binary forms, with or without +-dnl modification, are permitted provided that the following conditions +-dnl are met: +-dnl 1. Redistributions of source code must retain the above copyright +-dnl notice, this list of conditions and the following disclaimer. +-dnl 2. Redistributions in binary form must reproduce the above copyright +-dnl notice, this list of conditions and the following disclaimer in the +-dnl documentation and/or other materials provided with the distribution. +-dnl +-dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +-dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +-dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +-dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +-dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +-dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +-dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +-dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +-dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- +-AC_DEFUN([ATF_MODULE_ENV], [ +- AC_CHECK_FUNCS([putenv setenv unsetenv]) +-]) + +From 402b9362d01448074c4d2d91a8c770e591577167 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Wed, 25 Dec 2024 17:19:28 -0800 +Subject: [PATCH 8/9] Remove ATF_BUILD_CXX require.progs check + +This particular check unfortunately doesn't work when ATF_BUILD_CXX +contains multiple CXXFLAGS, or contains a path with spaces in it. Remove +this check to unbreak the dependent tests +post-793d4640031dc06ce8a239ffa9ab61322104c4ca. + +Signed-off-by: Enji Cooper +--- + atf-c++/detail/test_helpers.hpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/atf-c++/detail/test_helpers.hpp b/atf-c++/detail/test_helpers.hpp +index c1171801..1c4c316f 100644 +--- a/atf-c++/detail/test_helpers.hpp ++++ b/atf-c++/detail/test_helpers.hpp +@@ -45,8 +45,6 @@ + { \ + set_md_var("descr", "Tests that the " hdrname " file can be " \ + "included on its own, without any prerequisites"); \ +- const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \ +- set_md_var("require.progs", cxx); \ + } \ + ATF_TEST_CASE_BODY(name) \ + { \ +@@ -58,8 +56,6 @@ + ATF_TEST_CASE_HEAD(name) \ + { \ + set_md_var("descr", descr); \ +- const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \ +- set_md_var("require.progs", cxx); \ + } \ + ATF_TEST_CASE_BODY(name) \ + { \ + +From f054eebc616577d973fa6f3b4ec440bb29671c20 Mon Sep 17 00:00:00 2001 +From: Enji Cooper +Date: Wed, 25 Dec 2024 20:17:15 -0800 +Subject: [PATCH 9/9] Remove redundant C++ toolchain check + +The C++ toolchain is sanity checked when C++14 conformance is checked; +there's no reason why we need to check whether or not the C++ toolchain +works again. + +Signed-off-by: Enji Cooper +--- + configure.ac | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 00ee124c..e36f9817 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,16 +64,6 @@ AC_PROG_CXX + AC_LANG_COMPILER(C++) + AC_PROG_CPP + AX_CXX_COMPILE_STDCXX(14, noext, mandatory) +-AC_CACHE_CHECK([whether the C++ compiler works], +- [atf_cv_prog_cxx_works], +- [AC_LANG_PUSH([C++]) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], +- [atf_cv_prog_cxx_works=yes], +- [atf_cv_prog_cxx_works=no]) +- AC_LANG_POP]) +-if test "${atf_cv_prog_cxx_works}" = no; then +- AC_MSG_ERROR([C++ compiler cannot create executables]) +-fi + + KYUA_DEVELOPER_MODE([C,C++]) + diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 2a1090302ee9..cafb761ef870 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -320,6 +320,7 @@ def auto_patchelf( ignore_missing: list[str] = [], append_rpaths: list[Path] = [], keep_libc: bool = False, + add_existing: bool = True, extra_args: list[str] = []) -> None: if not paths_to_patch: @@ -327,7 +328,9 @@ def auto_patchelf( # Add all shared objects of the current output path to the cache, # before lib_dirs, so that they are chosen first in find_dependency. - populate_cache(paths_to_patch, recursive) + if add_existing: + populate_cache(paths_to_patch, recursive) + populate_cache(lib_dirs) dependencies = [] @@ -360,35 +363,51 @@ def main() -> None: prog="auto-patchelf", description='auto-patchelf tries as hard as possible to patch the' ' provided binary files by looking for compatible' - 'libraries in the provided paths.') + ' libraries in the provided paths.') parser.add_argument( "--ignore-missing", nargs="*", type=str, - help="Do not fail when some dependencies are not found.") + default=[], + help="Do not fail when some dependencies are not found." + ) parser.add_argument( "--no-recurse", dest="recursive", action="store_false", - help="Disable the recursive traversal of paths to patch.") + help="Disable the recursive traversal of paths to patch." + ) parser.add_argument( - "--paths", nargs="*", type=Path, + "--paths", + nargs="*", + type=Path, + required=True, help="Paths whose content needs to be patched." " Single files and directories are accepted." - " Directories are traversed recursively by default.") + " Directories are traversed recursively by default." + ) parser.add_argument( - "--libs", nargs="*", type=Path, + "--libs", + nargs="*", + type=Path, + default=[], help="Paths where libraries are searched for." " Single files and directories are accepted." - " Directories are not searched recursively.") + " Directories are not searched recursively." + ) parser.add_argument( - "--runtime-dependencies", nargs="*", type=Path, + "--runtime-dependencies", + nargs="*", + type=Path, + default=[], help="Paths to prepend to the runtime path of executable binaries." - " Subject to deduplication, which may imply some reordering.") + " Subject to deduplication, which may imply some reordering." + ) parser.add_argument( "--append-rpaths", nargs="*", type=Path, + default=[], help="Paths to append to all runtime paths unconditionally", ) parser.add_argument( @@ -397,6 +416,12 @@ def main() -> None: action="store_true", help="Attempt to search for and relink libc dependencies.", ) + parser.add_argument( + "--ignore-existing", + dest="add_existing", + action="store_false", + help="Do not add the existing rpaths of the patched files to the list of directories to search for dependencies.", + ) parser.add_argument( "--extra-args", # Undocumented Python argparse feature: consume all remaining arguments @@ -404,7 +429,8 @@ def main() -> None: # last. nargs="...", type=str, - help="Extra arguments to pass to patchelf. This argument should always come last." + default=[], + help="Extra arguments to pass to patchelf. This argument should always come last.", ) print("automatically fixing dependencies for ELF files") @@ -419,6 +445,7 @@ def main() -> None: args.ignore_missing, append_rpaths=args.append_rpaths, keep_libc=args.keep_libc, + add_existing=args.add_existing, extra_args=args.extra_args) diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix index e69b8ede4004..516c5ec79b06 100644 --- a/pkgs/by-name/ba/bash-completion/package.nix +++ b/pkgs/by-name/ba/bash-completion/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.15.0"; + version = "2.16.0"; # Using fetchurl because fetchGithub or fetchzip will have trouble on # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"; - sha256 = "sha256-l2pi7mImlwKDzahey5x6Soj2JXTApvnoVhJpdt7PGgY="; + hash = "sha256-M2m9XkGKdfuZCGOSWu1bQgOYrOuzIOxMAwaz6uI/EHo="; }; strictDeps = true; @@ -62,14 +62,9 @@ stdenv.mkDerivation rec { --ignore=test/t/test_screen.py ''; - prePatch = - lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* - '' - + lib.optionalString stdenv.hostPlatform.isFreeBSD '' - # please remove this next release! - touch completions/{pkg_delete,freebsd-update,kldload,kldunload,portinstall,portsnap,portupgrade} - ''; + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* + ''; meta = with lib; { homepage = "https://github.com/scop/bash-completion"; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 680933ef9ec4..fb5d64a39825 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, libuuid, libsodium, @@ -37,6 +38,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng="; }; + patches = [ + # backport patch to fix build with latest liburcu + (fetchpatch { + url = "https://github.com/koverstreet/bcachefs-tools/commit/634c812a1ed05de8e3d1dc146eed95b942e1e38d.patch"; + hash = "sha256-AL+nflQHKIwzI35NXZG2rniNjUfgLmv3osHHdpB1cGs="; + }) + ]; + nativeBuildInputs = [ pkg-config cargo diff --git a/pkgs/by-name/bc/bcc/bashreadline.py-remove-dependency-on-elftools.patch b/pkgs/by-name/bc/bcc/bashreadline.py-remove-dependency-on-elftools.patch new file mode 100644 index 000000000000..dfc3d3c9d2bb --- /dev/null +++ b/pkgs/by-name/bc/bcc/bashreadline.py-remove-dependency-on-elftools.patch @@ -0,0 +1,48 @@ +From 25c77bff079c331ae12d9e4499c82fdabf301610 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Sun, 21 Jul 2024 20:59:51 +0900 +Subject: [PATCH] bashreadline.py: remove dependency on elftools + +This helper is only here to differentiate between very old bash +versions or semi-recent ones; since we'll only catter to newer +bash versions we don't need to bother with elftools here: +just hardcode the newer symbol. +--- + tools/bashreadline.py | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/tools/bashreadline.py b/tools/bashreadline.py +index 7e8324a2c0ea..e4b20aeb2371 100755 +--- a/tools/bashreadline.py ++++ b/tools/bashreadline.py +@@ -17,7 +17,6 @@ + # 12-Feb-2016 Allan McAleavy migrated to BPF_PERF_OUTPUT + + from __future__ import print_function +-from elftools.elf.elffile import ELFFile + from bcc import BPF + from time import strftime + import argparse +@@ -33,18 +32,7 @@ args = parser.parse_args() + + name = args.shared if args.shared else "/bin/bash" + +- +-def get_sym(filename): +- with open(filename, 'rb') as f: +- elf = ELFFile(f) +- symbol_table = elf.get_section_by_name(".dynsym") +- for symbol in symbol_table.iter_symbols(): +- if symbol.name == "readline_internal_teardown": +- return "readline_internal_teardown" +- return "readline" +- +- +-sym = get_sym(name) ++sym = "readline_internal_teardown" + + # load BPF program + bpf_text = """ +-- +2.45.2 + diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index b0f511c96b6c..e8404b9fb624 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -15,13 +15,14 @@ netperf, nixosTests, python3Packages, + readline, stdenv, zip, }: python3Packages.buildPythonApplication rec { pname = "bcc"; - version = "0.32.0"; + version = "0.33.0"; disabled = !stdenv.hostPlatform.isLinux; @@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; tag = "v${version}"; - hash = "sha256-urEHDDBBIdopQiT/QI5WtTbIO45pBk6bTNpfs8q/2hA="; + hash = "sha256-6dT3seLuEVQNKWiYGLK1ajXzW7pb62S/GQ0Lp4JdGjc="; }; format = "other"; @@ -50,6 +51,9 @@ python3Packages.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + # Quick & dirty fix for bashreadline + # https://github.com/NixOS/nixpkgs/issues/328743 + ./bashreadline.py-remove-dependency-on-elftools.patch ]; propagatedBuildInputs = [ python3Packages.netaddr ]; @@ -85,7 +89,10 @@ python3Packages.buildPythonApplication rec { # https://github.com/iovisor/bcc/issues/3996 substituteInPlace src/cc/libbcc.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + + substituteInPlace tools/bashreadline.py \ + --replace-fail '/bin/bash' '${readline}/lib/libreadline.so' ''; preInstall = '' diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index fa0054951a1b..b21822ada2c8 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.16.1-3"; - arm64-hash = "sha256-VUbBHt9MzHZdbWJ4ak8T3vf5ZEi/gVTU89tKsJb+iu4="; - x86_64-hash = "sha256-BkSreYgz3d2/Hw5lmH5IMCKxzqPO+Lb2vv6OuOkQOL0="; + version = "1.16.2-2"; + arm64-hash = "sha256-re+QOxuFEBmymJ4Cbsv+1UEDxWACudGoHOpha8PIAso="; + x86_64-hash = "sha256-89I47II8g4Q7CIwxmt797SzeZlAvVu2cTh05puWZ8+8="; } diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 5c0a43804cd6..4bb110d0b884 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -39,13 +39,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.12.0"; + version = "2024.12.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54="; + hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M="; }; patches = [ @@ -70,7 +70,7 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; + npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index 4c3a3b718727..4fb78ff4e646 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -14,6 +14,7 @@ cryptominisat, zlib, pkg-config, + cmake, }: stdenv.mkDerivation (finalAttrs: { @@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config git ninja + cmake ]; buildInputs = [ cadical @@ -48,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { # note: the default value for default_library fails to link dynamic dependencies # but setting it to shared works even in pkgsStatic "-Ddefault_library=shared" + "-Dcryptominisat=true" (lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck) ]; @@ -56,6 +59,28 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; # two tests fail on darwin doCheck = stdenv.hostPlatform.isLinux; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export needle=11011110101011011011111011101111 + + cat > file.smt2 < --#define USE_RESOLVE_ON_IPS 1 --# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ -- defined(USE_IPV6) --# define CURL_MACOS_CALL_COPYPROXIES 1 --# endif - #endif - - #ifdef USE_LWIPSOCK diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 3b6a80a550c4..cae5089ffdfc 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.30.5"; + version = "3.31.3"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-n1XhpAUI8vKbfgZfoIwp+CxAL6BALag5//5koldVqG0="; + hash = "sha256-+sRbxtQQtJsxE6uGYHSIjWyencgaFBh0RG6yOaw4y4c="; }; patches = [ @@ -61,6 +61,9 @@ stdenv.mkDerivation (finalAttrs: { ./000-nixpkgs-cmake-prefix-path.diff # Don't search in non-Nix locations such as /usr, but do search in our libc. ./001-search-path.diff + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # TODO: Remove these in `staging`. + # Don't depend on frameworks. ./002-application-services.diff # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d @@ -68,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.hostPlatform.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix index 04fc1bbab70f..24798c0a3f38 100644 --- a/pkgs/by-name/co/comic-mandown/package.nix +++ b/pkgs/by-name/co/comic-mandown/package.nix @@ -6,9 +6,7 @@ }: let mandown' = python3Packages.mandown.overridePythonAttrs (prev: { - propagatedBuildInputs = - prev.propagatedBuildInputs - ++ lib.optionals withGUI prev.optional-dependencies.gui; + dependencies = prev.dependencies ++ lib.optionals withGUI prev.optional-dependencies.gui; }); mandownApp = python3Packages.toPythonApplication mandown'; in diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index f7502bca95a2..951c3ef3869f 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -4,26 +4,25 @@ fetchFromGitHub, just, pkg-config, - rust, rustPlatform, libglvnd, libxkbcommon, wayland, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cosmic-panel"; - version = "unstable-2023-11-13"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c"; - hash = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + tag = "epoch-${version}"; + hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1XtW72KPdRM5gHIM3Fw2PZCobBXYDMAqjZ//Ebr51tc="; + cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 3141138c692a..0af1d26d98e8 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.27.1"; + version = "5.27.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-C/kUWFL305JJ3MGCVc1SQdHdZcuaF01/feQd5AdKQFM="; + sha256 = "sha256-WdIXakivkeg98c3zDKUBlFIRcFo8iFHgFZVMIbkrR0g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 426803998623..abab133cf716 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "0.30.5"; + version = "0.30.6"; executables = "dotnet-csharpier"; - nugetHash = "sha256-8NuhwRhvEZtmPtgbLLNbTOLUoDAihtkKE8aw5UQ0O5A="; + nugetHash = "sha256-A39F3ohTHZo8yYoyBOAUeW0bk98Za74Esz0Tx0tXgDI="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch b/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch new file mode 100644 index 000000000000..5b0979fd4cbd --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch @@ -0,0 +1,33 @@ +From ff5091aa9f73802e894b1cbdf24ab84e103200e2 Mon Sep 17 00:00:00 2001 +From: Andy Pan +Date: Thu, 12 Dec 2024 12:48:56 +0000 +Subject: [PATCH] async-thread: avoid closing eventfd twice + +When employing eventfd for socketpair, there is only one file +descriptor. Closing that fd twice might result in fd corruption. +Thus, we should avoid closing the eventfd twice, following the +pattern in lib/multi.c. + +Fixes #15725 +Closes #15727 +Reported-by: Christian Heusel +--- + lib/asyn-thread.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c +index a58e4b790494..32d496b107cb 100644 +--- a/lib/asyn-thread.c ++++ b/lib/asyn-thread.c +@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd) + * close one end of the socket pair (may be done in resolver thread); + * the other end (for reading) is always closed in the parent thread. + */ ++#ifndef USE_EVENTFD + if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { + wakeup_close(tsd->sock_pair[1]); + } ++#endif + #endif + memset(tsd, 0, sizeof(*tsd)); + } diff --git a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch b/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch deleted file mode 100644 index 8cf36fea64b6..000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0cdde0fdfbeb8c35420f6d03fa4b77ed73497694 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 7 Nov 2024 17:03:54 +0100 -Subject: [PATCH] netrc: support large file, longer lines, longer tokens - -Regression from 3b43a05e000aa8f6 (shipped in 8.11.0) - -Reported-by: Moritz -Fixes #15513 -Closes #15514 ---- - lib/netrc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/netrc.c b/lib/netrc.c -index c23f927cef32d35059360f04be3c7833589f5df5..034c0307a43e3b86c9c004387cedf273588370e1 100644 ---- a/lib/netrc.c -+++ b/lib/netrc.c -@@ -58,9 +58,9 @@ enum found_state { - #define NETRC_FAILED -1 - #define NETRC_SUCCESS 0 - --#define MAX_NETRC_LINE 4096 --#define MAX_NETRC_FILE (64*1024) --#define MAX_NETRC_TOKEN 128 -+#define MAX_NETRC_LINE 16384 -+#define MAX_NETRC_FILE (128*1024) -+#define MAX_NETRC_TOKEN 4096 - - static CURLcode file2memory(const char *filename, struct dynbuf *filebuf) - { diff --git a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch b/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch deleted file mode 100644 index d614be60b9e4..000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch +++ /dev/null @@ -1,217 +0,0 @@ -From f5c616930b5cf148b1b2632da4f5963ff48bdf88 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 7 Nov 2024 08:52:38 +0100 -Subject: [PATCH] duphandle: also init netrc - -The netrc init was only done in the Curl_open, meaning that a duplicated -handle would not get inited properly. - -Added test 2309 to verify. It does netrc auth with a duplicated handle. - -Regression from 3b43a05e000aa8f65bda513f733a - -Reported-by: tranzystorekk on github -Fixes #15496 -Closes #15503 ---- - lib/easy.c | 1 + - tests/data/Makefile.am | 2 +- - tests/data/test2309 | 66 ++++++++++++++++++++++++++++++++++++++ - tests/libtest/Makefile.inc | 5 ++- - tests/libtest/lib2309.c | 66 ++++++++++++++++++++++++++++++++++++++ - 5 files changed, 138 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test2309 - create mode 100644 tests/libtest/lib2309.c - -diff --git a/lib/easy.c b/lib/easy.c -index d16fa8c07afec00ab6186880eff05c925da00380..ac8fab34220d9b4f1f8f9cb7bc504a5024a46cca 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d) - goto fail; - - Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER); -+ Curl_netrc_init(&outcurl->state.netrc); - - /* the connection pool is setup on demand */ - outcurl->state.lastconnect_id = -1; -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 02bf2ae25bfd49dce27d4cd2320a2794ba5b4212..ea5221c00fd4193e1713b1313da338f1ea6aee4f 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -255,7 +255,7 @@ test2100 \ - test2200 test2201 test2202 test2203 test2204 test2205 \ - \ - test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \ --test2308 \ -+test2308 test2309 \ - \ - test2400 test2401 test2402 test2403 test2404 test2405 test2406 \ - \ -diff --git a/tests/data/test2309 b/tests/data/test2309 -new file mode 100644 -index 0000000000000000000000000000000000000000..4ba78ee91e179c932f8bfa776d32f311512ef8e6 ---- /dev/null -+++ b/tests/data/test2309 -@@ -0,0 +1,66 @@ -+ -+ -+ -+netrc -+HTTP -+ -+ -+# -+# Server-side -+ -+ -+HTTP/1.1 200 OK -+Date: Tue, 09 Nov 2010 14:49:00 GMT -+Server: test-server/fake -+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT -+ETag: "21025-dc7-39462498" -+Accept-Ranges: bytes -+Content-Length: 6 -+Connection: close -+Content-Type: text/html -+Funny-head: yesyes -+ -+-foo- -+ -+ -+ -+# -+# Client-side -+ -+ -+http -+ -+ -+proxy -+ -+ -+# Reproducing issue 15496 -+ -+HTTP with .netrc using duped easy handle -+ -+ -+lib%TESTNUMBER -+ -+ -+http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ -+ -+ -+ -+machine github.com -+ -+login daniel -+password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1 -+ -+ -+ -+ -+ -+GET http://github.com/ HTTP/1.1 -+Host: github.com -+Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64% -+Accept: */* -+Proxy-Connection: Keep-Alive -+ -+ -+ -+ -diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc -index 339a00fc4ed41e1491ea945ff9ebeb7caf058c69..8f58fd64229d5cbcebdb4949111b3c3184d82eb3 100644 ---- a/tests/libtest/Makefile.inc -+++ b/tests/libtest/Makefile.inc -@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq \ - lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \ - lib1960 lib1964 \ - lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \ -- lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 \ -+ lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 lib2309 \ - lib2402 lib2404 lib2405 \ - lib2502 \ - lib3010 lib3025 lib3026 lib3027 \ -@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS) - lib2308_SOURCES = lib2308.c $(SUPPORTFILES) - lib2308_LDADD = $(TESTUTIL_LIBS) - -+lib2309_SOURCES = lib2309.c $(SUPPORTFILES) -+lib2309_LDADD = $(TESTUTIL_LIBS) -+ - lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) - lib2402_LDADD = $(TESTUTIL_LIBS) - -diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c -new file mode 100644 -index 0000000000000000000000000000000000000000..11f1c1fbd886846d5901b03ba9cd0314672fec99 ---- /dev/null -+++ b/tests/libtest/lib2309.c -@@ -0,0 +1,66 @@ -+/*************************************************************************** -+ * _ _ ____ _ -+ * Project ___| | | | _ \| | -+ * / __| | | | |_) | | -+ * | (__| |_| | _ <| |___ -+ * \___|\___/|_| \_\_____| -+ * -+ * Copyright (C) Daniel Stenberg, , et al. -+ * -+ * This software is licensed as described in the file COPYING, which -+ * you should have received as part of this distribution. The terms -+ * are also available at https://curl.se/docs/copyright.html. -+ * -+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell -+ * copies of the Software, and permit persons to whom the Software is -+ * furnished to do so, under the terms of the COPYING file. -+ * -+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -+ * KIND, either express or implied. -+ * -+ * SPDX-License-Identifier: curl -+ * -+ ***************************************************************************/ -+ -+#include "test.h" -+#include "testtrace.h" -+ -+#include -+ -+static size_t cb_ignore(char *buffer, size_t size, size_t nmemb, void *userp) -+{ -+ (void)buffer; -+ (void)size; -+ (void)nmemb; -+ (void)userp; -+ return CURL_WRITEFUNC_ERROR; -+} -+ -+CURLcode test(char *URL) -+{ -+ CURL *curl; -+ CURL *curldupe; -+ CURLcode res = CURLE_OK; -+ -+ global_init(CURL_GLOBAL_ALL); -+ curl = curl_easy_init(); -+ if(curl) { -+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_ignore); -+ curl_easy_setopt(curl, CURLOPT_URL, URL); -+ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); -+ curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3); -+ curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED); -+ curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2); -+ -+ curldupe = curl_easy_duphandle(curl); -+ if(curldupe) { -+ res = curl_easy_perform(curldupe); -+ printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR); -+ fflush(stdout); -+ curl_easy_cleanup(curldupe); -+ } -+ curl_easy_cleanup(curl); -+ } -+ curl_global_cleanup(); -+ return CURLE_OK; -+} diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 22aa1e4d64f3..9d670607d4c3 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -53,26 +53,20 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.11.0"; + version = "8.11.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-21nPDWccpuf1wsXsF3CEozp54EyX5xzxg6XN6iNQVOs="; + hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/356114 - # https://github.com/curl/curl/issues/15496 - # https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88 - # TODO: Remove this patch when 8.11.1/8.12.0 releases - ./fix-netrc-regression.patch - - # https://github.com/curl/curl/issues/15513 - # https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694 - ./fix-netrc-regression-2.patch + # FIXME: avoid rebuilding darwin stdenv for now + patches = lib.optionals (!stdenv.isDarwin) [ + # https://github.com/curl/curl/issues/15725 + ./fix-eventfd-free.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 3143b3c33a76..dc8c0331a5b0 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -6,16 +6,19 @@ buildGoModule, fetchFromGitHub, lib, + _experimental-update-script-combinators, + nix-update-script, }: let pname = "daed"; - version = "0.8.0"; + version = "0.9.0"; + src = fetchFromGitHub { owner = "daeuniverse"; repo = "daed"; tag = "v${version}"; - hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI="; + hash = "sha256-5olEPaS/6ag69KUwBG8qXpyr1B2qrLK+vf13ZljHH+c="; fetchSubmodules = true; }; @@ -24,7 +27,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY="; + hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q="; }; nativeBuildInputs = [ @@ -34,23 +37,34 @@ let buildPhase = '' runHook preBuild + pnpm build + runHook postBuild ''; installPhase = '' runHook preInstall - mkdir -p $out - cp -R dist/* $out/ + + cp -R dist $out + runHook postInstall ''; }; in + buildGoModule rec { - inherit pname version src; + inherit + pname + version + src + web + ; + sourceRoot = "${src.name}/wing"; - vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U="; + vendorHash = "sha256-qB2qcJ82mFcVvjlYp/N9sqzwPotTROgymSX5NfEQMuY="; + proxyVendor = true; nativeBuildInputs = [ clang ]; @@ -81,6 +95,15 @@ buildGoModule rec { runHook postBuild ''; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "daed.web"; + }) + (nix-update-script { + extraArgs = [ "--version=skip" ]; + }) + ]; + meta = { description = "Modern dashboard with dae"; homepage = "https://github.com/daeuniverse/daed"; diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix new file mode 100644 index 000000000000..62a47919a000 --- /dev/null +++ b/pkgs/by-name/da/daggerfall-unity/package.nix @@ -0,0 +1,123 @@ +{ + alsa-lib, + autoPatchelfHook, + copyDesktopItems, + fetchurl, + fetchzip, + lib, + libGL, + libXScrnSaver, + libXcursor, + libXi, + libXinerama, + libXrandr, + libXxf86vm, + libpulseaudio, + libudev0-shim, + makeDesktopItem, + nix-update-script, + stdenv, + vulkan-loader, + pname ? "daggerfall-unity", + includeUnfree ? false, +}: +let + docFiles = + [ + (fetchurl { + url = "https://www.dfworkshop.net/static_files/daggerfallunity/Daggerfall%20Unity%20Manual.pdf"; + hash = "sha256-FywlD0K5b4vUWzyzANlF9575XTDLivbsym7F+qe0Dm8="; + name = "Daggerfall Unity Manual.pdf"; + meta.license = lib.licenses.mit; + }) + ] + ++ lib.optionals includeUnfree [ + (fetchurl { + url = "https://cdn.bethsoft.com/bethsoft.com/manuals/Daggerfall/daggerfall-en.pdf"; + hash = "sha256-24KSP/E7+KvSRTMDq63NVlVWTFZnQj1yya8wc36yrC0="; + meta.license = lib.licenses.unfree; + }) + ]; +in +stdenv.mkDerivation (finalAttrs: { + inherit pname; + version = "1.1.1"; + + src = fetchzip { + url = "https://github.com/Interkarma/daggerfall-unity/releases/download/v${finalAttrs.version}/dfu_linux_64bit-v${finalAttrs.version}.zip"; + hash = "sha256-JuhhVLpREM9e9UtlDttvFUhHWpH7Sh79OEo1OM4ggKA="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + alsa-lib + libGL + libXScrnSaver + libXcursor + libXi + libXinerama + libXrandr + libXxf86vm + libpulseaudio + libudev0-shim + vulkan-loader + ]; + + strictDeps = true; + + installPhase = '' + runHook preInstall + + mkdir --parents "$out/share/doc/" + cp --recursive * "$out" + + ${lib.strings.concatMapStringsSep "\n" (file: '' + cp "${file}" "$out/share/doc/${file.name}" + '') docFiles} + + runHook postInstall + ''; + + appendRunpaths = [ (lib.makeLibraryPath finalAttrs.buildInputs) ]; + + desktopItems = [ + (makeDesktopItem { + name = "daggerfall-unity"; + desktopName = "Daggerfall Unity"; + comment = finalAttrs.meta.description; + icon = "UnityPlayer"; + exec = "DaggerfallUnity.x86_64"; + categories = [ "Game" ]; + }) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v(\\d+(\\.\\d+)*)$" ]; + }; + + meta = { + homepage = "https://www.dfworkshop.net/"; + description = "Open source recreation of Daggerfall in the Unity engine"; + longDescription = '' + Daggerfall Unity is an open source recreation of Daggerfall in the Unity engine created by Daggerfall Workshop. + + Experience the adventure and intrigue of Daggerfall with all of its original charm along with hundreds of fixes, quality of life enhancements, and extensive mod support. + + Includes Daggerfall Unity manual. + + ${lib.optionalString includeUnfree '' + This "unfree" variant also includes the manual for Daggerfall (the game, not the open source engine). + ''} + ''; + changelog = "https://github.com/Interkarma/daggerfall-unity/releases/tag/v${finalAttrs.version}"; + mainProgram = "DaggerfallUnity.x86_64"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/da/dash-mpd-cli/Cargo.lock b/pkgs/by-name/da/dash-mpd-cli/Cargo.lock deleted file mode 100644 index 544d57a3078c..000000000000 --- a/pkgs/by-name/da/dash-mpd-cli/Cargo.lock +++ /dev/null @@ -1,4829 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "assert_cmd" -version = "2.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "libc", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_fs" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998282f8f49ccd6116b0ed8a4de0fbd3151697920e7c7533416d6e25e76434a7" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-io" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.1", - "futures-lite", - "rustix", - "tracing", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "async-signal" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "aws-lc-rs" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" -dependencies = [ - "aws-lc-sys", - "mirai-annotations", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - -[[package]] -name = "axum" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tower 0.5.1", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-auth" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8169113a185f54f68614fcfc3581df585d30bf8542bcb99496990e1025e4120a" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.7", - "http", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 1.0.1", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64-serde" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" -dependencies = [ - "base64 0.21.7", - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.79", - "which", -] - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "regex-automata 0.4.8", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.10.0", - "terminal_size", - "unicase", - "unicode-width", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - -[[package]] -name = "colorchoice" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" -dependencies = [ - "cookie", - "idna 0.5.0", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.79", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "dash-mpd" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f463c2566a9469a93206848c54e1c77ffa01bce1bc4aecaf7f63de9f851252" -dependencies = [ - "async-recursion", - "backoff", - "base64 0.22.1", - "base64-serde", - "bstr", - "bytes", - "chrono", - "colored", - "data-url", - "ffprobe", - "file-format", - "fs-err", - "governor", - "hex-literal", - "iso8601", - "lazy_static", - "num-traits", - "pssh-box", - "quick-xml", - "regex", - "reqwest", - "sanitise-file-name", - "serde", - "serde_path_to_error", - "serde_with", - "tempfile", - "thiserror", - "tokio", - "tracing", - "url", - "xattr", - "xmltree", -] - -[[package]] -name = "dash-mpd-cli" -version = "0.2.23" -dependencies = [ - "anyhow", - "assert_cmd", - "assert_fs", - "axum", - "axum-auth", - "clap", - "colored", - "dash-mpd", - "decrypt-cookies", - "ffprobe", - "file-format", - "fs-err", - "http", - "hyper", - "hyper-serve", - "hyper-util", - "indicatif", - "json", - "lazy_static", - "mp4", - "number_prefix", - "predicates", - "quick-xml", - "reqwest", - "rustls 0.23.14", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde_json", - "strum", - "tempfile", - "test-log", - "time", - "tokio", - "tokio-rustls", - "tracing", - "tracing-subscriber", - "versions", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "decrypt-cookies" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef3c1cd46596d50cbf2d99c7da82b7feac82e5b446591239258ca706e3a985cb" -dependencies = [ - "aes", - "aes-gcm", - "base64 0.22.1", - "bytes", - "cbc", - "cfg-if", - "chrono", - "dirs", - "keyring", - "miette", - "pbkdf2", - "rayon", - "reqwest", - "rust-ini", - "sea-orm", - "secret-service", - "serde", - "serde_json", - "sha1", - "strum", - "tokio", - "tracing", - "windows", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[package]] -name = "educe" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -dependencies = [ - "serde", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "ffprobe" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ffef835e1f9ac151db5bb2adbb95c9dfe1f315f987f011dd89cd655b4e9a52c" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "file-format" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffe3a660c3a1b10e96f304a9413d673b2118d62e4520f7ddf4a4faccfe8b9b9" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs-err" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" -dependencies = [ - "autocfg", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", -] - -[[package]] -name = "globwalk" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" -dependencies = [ - "bitflags", - "ignore", - "walkdir", -] - -[[package]] -name = "governor" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "portable-atomic", - "quanta", - "rand", - "smallvec", - "spinning_top", -] - -[[package]] -name = "h2" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hxdmp" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b27f28a7466846baca75f0a5244e546e44178eb7f1c07a3820f413e91c6b0" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls 0.23.14", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots 0.26.6", -] - -[[package]] -name = "hyper-serve" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5e5355c5001f9528a5626fa7f6ef31164c0e7c42898fc210d43d055b4894af" -dependencies = [ - "arc-swap", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "pin-project-lite", - "rustls 0.23.14", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower 0.4.13", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.8", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" -dependencies = [ - "equivalent", - "hashbrown 0.15.0", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "inherent" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "iso8601" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" -dependencies = [ - "nom", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" - -[[package]] -name = "keyring" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3d701d3de5b9c4b0d9d077f8c2c66f0388d75e96932ebbb7cdff8713d7f7c6" -dependencies = [ - "security-framework", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags", - "libc", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miette" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" -dependencies = [ - "cfg-if", - "miette-derive", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - -[[package]] -name = "mp4" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ef834d5ed55e494a2ae350220314dc4aacd1c43a9498b00e320e0ea352a5c3" -dependencies = [ - "byteorder", - "bytes", - "num-rational", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "multimap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.36.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown 0.14.5", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "ouroboros" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", - "sha1", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.6.0", -] - -[[package]] -name = "pin-project" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "predicates" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" - -[[package]] -name = "predicates-tree" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" -dependencies = [ - "proc-macro2", - "syn 2.0.79", -] - -[[package]] -name = "proc-macro-crate" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" -dependencies = [ - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "proc-macro2" -version = "1.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" -dependencies = [ - "bytes", - "heck 0.5.0", - "itertools 0.13.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 2.0.79", - "tempfile", -] - -[[package]] -name = "prost-derive" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "prost-types" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" -dependencies = [ - "prost", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "pssh-box" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8dd7718e1f7b4215e2a72d19aff426a5a0ff7055764920c902a35a36dd3f4" -dependencies = [ - "anyhow", - "base64 0.22.1", - "bstr", - "byteorder", - "bytes", - "hex", - "hex-literal", - "hxdmp", - "num_enum", - "prost", - "prost-build", - "prost-types", - "quick-xml", - "serde", - "serde-xml-rs", - "serde_json", - "serde_path_to_error", - "serde_with", - "tracing", - "zerocopy", -] - -[[package]] -name = "publicsuffix" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ - "idna 0.3.0", - "psl-types", -] - -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quinn" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.14", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash 2.0.0", - "rustls 0.23.14", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" -dependencies = [ - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reqwest" -version = "0.12.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" -dependencies = [ - "async-compression", - "base64 0.22.1", - "bytes", - "cookie", - "cookie_store", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.14", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.26.6", - "windows-registry", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rust-ini" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustix" -version = "0.38.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" -dependencies = [ - "aws-lc-rs", - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "sanitise-file-name" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d36299972b96b8ae7e8f04ecbf75fb41a27bf3781af00abcf57609774cb911" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sea-bae" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25" -dependencies = [ - "heck 0.4.1", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "sea-orm" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1fee0cf8528dbe6eda29d5798afc522a63b75e44c5b15721e6e64af9c7cc4b" -dependencies = [ - "async-stream", - "async-trait", - "futures", - "log", - "ouroboros", - "sea-orm-macros", - "sea-query", - "sea-query-binder", - "serde", - "sqlx", - "strum", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "sea-orm-macros" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8737b566799ed0444f278d13c300c4c6f1a91782f60ff5825a591852d5502030" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "sea-bae", - "syn 2.0.79", - "unicode-ident", -] - -[[package]] -name = "sea-query" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4fd043b8117af233e221f73e3ea8dfbc8e8c3c928017c474296db45c649105c" -dependencies = [ - "educe", - "inherent", - "ordered-float", -] - -[[package]] -name = "sea-query-binder" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754965d4aee6145bec25d0898e5c931e6c22859789ce62fd85a42a15ed5a8ce3" -dependencies = [ - "sea-query", - "sqlx", -] - -[[package]] -name = "secret-service" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" -dependencies = [ - "aes", - "cbc", - "futures-util", - "generic-array", - "hkdf", - "num", - "once_cell", - "rand", - "serde", - "sha2", - "zbus", -] - -[[package]] -name = "security-framework" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "serde_json" -version = "1.0.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.6.0", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener 2.5.3", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.6.0", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", - "webpki-roots 0.25.4", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.79", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "tempfile" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-log" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" -dependencies = [ - "env_logger", - "test-log-macros", - "tracing-subscriber", -] - -[[package]] -name = "test-log-macros" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "thiserror" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls 0.23.14", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap 2.6.0", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 0.1.2", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset", - "tempfile", - "winapi", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "versions" -version = "6.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25d498b63d1fdb376b4250f39ab3a5ee8d103957346abacd911e2d8b612c139" -dependencies = [ - "itertools 0.13.0", - "nom", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.79", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "web-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webpki-roots" -version = "0.26.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" -dependencies = [ - "memchr", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "xml-rs" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" - -[[package]] -name = "xmltree" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b619f8c85654798007fb10afa5125590b43b088c225a25fc2fec100a9fad0fc6" -dependencies = [ - "xml-rs", -] - -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-process", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener 5.3.1", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.79", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.79", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index b9a43ee6a121..cef1ca6e116f 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -1,33 +1,63 @@ { lib, - stdenv, + stdenvNoCC, rustPlatform, fetchFromGitHub, + makeWrapper, protobuf, + ffmpeg, + libxslt, + shaka-packager, }: +let + # dash-mpd-cli looks for a binary named `shaka-packager`, while + # shaka-packager provides `packager`. + shaka-packager-wrapped = stdenvNoCC.mkDerivation { + name = "shaka-packager-wrapped"; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager + ''; + }; +in rustPlatform.buildRustPackage rec { pname = "dash-mpd-cli"; - version = "0.2.23"; + version = "0.2.24"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; - rev = "v${version}"; - hash = "sha256-gRtt7iocGmnFpdTEMv/U4izeR/NtdYYXX3eFXW5LGYs="; + tag = "v${version}"; + hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE="; }; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + patches = [ + ./use-shaka-by-default.patch + ]; - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-R54Np08hYpDoidsHr3rmhpX/QZZkZHGcCSoKk6nw9R8="; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ + makeWrapper + protobuf + ]; # The tests depend on network access. doCheck = false; + postInstall = '' + wrapProgram $out/bin/dash-mpd-cli \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg.bin + libxslt.bin + shaka-packager-wrapped + ] + } + ''; + meta = { description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest"; longDescription = '' diff --git a/pkgs/by-name/da/dash-mpd-cli/use-shaka-by-default.patch b/pkgs/by-name/da/dash-mpd-cli/use-shaka-by-default.patch new file mode 100644 index 000000000000..52619f7442cc --- /dev/null +++ b/pkgs/by-name/da/dash-mpd-cli/use-shaka-by-default.patch @@ -0,0 +1,12 @@ +diff --git a/src/main.rs b/src/main.rs +index f720d4c..a3c6c85 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -325,6 +325,7 @@ async fn main () -> Result<()> { + .value_name("APP") + .num_args(1) + .value_parser(["mp4decrypt", "shaka"]) ++ .default_value("shaka") + .help("Application to use to decrypt encrypted media streams (either mp4decrypt or shaka).")) + .arg(Arg::new("save-fragments") + .long("save-fragments") diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 1fa809859387..dc5a845b663f 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject (finalAttrs: { pname = "davis"; - version = "4.4.4"; + version = "5.0.2"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; - rev = "v${finalAttrs.version}"; - hash = "sha256-nQkyNs718Zrc2BiTNXSXPY23aiviJKoBJeuoSm5ISOI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Zl+6nrgspyg6P9gqYwah81Z6Mtni6nUlCp4gTjJWn9M="; }; - vendorHash = "sha256-zZlDonCwb9tJyckounv96eF4cx6Z/LBoAdB/r600HM4="; + vendorHash = "sha256-ZV5GNNtex+yKaMP5KaQkx5EaJRAJSwJjIZOCcXlnVW4="; postInstall = '' # Only include the files needed for runtime in the derivation diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 352fbdef4aa9..52e2ac001c12 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-TRMzKvJh5+s4+uLdLsORbnJvopHYEi28sIi2wo/eLBQ="; + hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4="; }; vendorHash = "sha256-n1Z3sNvNLX1QpfpDSGDygjbC6IE85SBJHvyliy11OjU="; diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix index 212f190b2777..ed786156a88d 100644 --- a/pkgs/by-name/de/der-ascii/package.nix +++ b/pkgs/by-name/de/der-ascii/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "der-ascii"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LgxGSZQNxwx08mK9G8mSuBFTOd3pC1mvz3Wz7Y+6XR4="; + sha256 = "sha256-yUHVPBUW1Csn3W5K9S2TWOq4aovzpaBK8BC0t8zkj3g="; }; vendorHash = null; diff --git a/pkgs/by-name/de/desktop-file-utils/setup-hook.sh b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh index 728070e34581..af6b3fab34ee 100644 --- a/pkgs/by-name/de/desktop-file-utils/setup-hook.sh +++ b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh @@ -3,4 +3,4 @@ mimeinfoPreFixupPhase() { rm -f $out/share/applications/mimeinfo.cache } -preFixupPhases="${preFixupPhases-} mimeinfoPreFixupPhase" +appendToVar preFixupPhases mimeinfoPreFixupPhase diff --git a/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh b/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh index cb6f419b0331..d4d5b333cac9 100644 --- a/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh +++ b/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -o errexit set -o nounset diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix index 1a4e0a0f089b..4a5c92f4a2c7 100644 --- a/pkgs/by-name/de/deterministic-uname/package.nix +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -1,14 +1,14 @@ -# expr and script based on our lsb_release { stdenv , lib -, substituteAll +, replaceVarsWith , coreutils , getopt +, runtimeShell , modDirVersion ? "" , forPlatform ? stdenv.buildPlatform }: -substituteAll { +replaceVarsWith { name = "uname"; src = ./deterministic-uname.sh; @@ -16,29 +16,31 @@ substituteAll { dir = "bin"; isExecutable = true; - inherit coreutils getopt; + replacements = { + inherit coreutils getopt runtimeShell; - uSystem = if forPlatform.uname.system != null then forPlatform.uname.system else "unknown"; - inherit (forPlatform.uname) processor; + uSystem = if forPlatform.uname.system != null then forPlatform.uname.system else "unknown"; + inherit (forPlatform.uname) processor; - # uname -o - # maybe add to lib/systems/default.nix uname attrset - # https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374 - # https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from - # https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4 - operatingSystem = - if forPlatform.isLinux - then "GNU/Linux" - else if forPlatform.isDarwin - then "Darwin" # darwin isn't in host-os.m4 so where does this come from? - else if forPlatform.isFreeBSD - then "FreeBSD" - else "unknown"; + # uname -o + # maybe add to lib/systems/default.nix uname attrset + # https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374 + # https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from + # https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4 + operatingSystem = + if forPlatform.isLinux + then "GNU/Linux" + else if forPlatform.isDarwin + then "Darwin" # darwin isn't in host-os.m4 so where does this come from? + else if forPlatform.isFreeBSD + then "FreeBSD" + else "unknown"; - # in os-specific/linux module packages - # --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ - # is a common thing to do. - modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; + # in os-specific/linux module packages + # --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + # is a common thing to do. + modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; + }; meta = with lib; { description = "Print certain system information (hardcoded with lib/system values)"; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 7fc8848217d2..360f40d011a4 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.15.3"; + version = "4.15.5"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-0vg3y/bUp5BTFhJbIdohvuj1DNu9bykDwMM3bWnKvNU="; + hash = "sha256-pb2r9XBQmS1pcCV9qBzGEPLfIgMaOFLh+5oW6Wks/sc="; }; - vendorHash = "sha256-JMi4FDgZT94KyqDR57xgp1vnP7Htdn/bksntbQdGyZ0="; + vendorHash = "sha256-x/FxspmR89Q2yZI0sP1D9OVUFEjMlpT/0IPusy5zHuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index f964f7633d9e..4c6da2efa0c2 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { # writes its output to stdout instead of creating a file. patches = [ ./db2x_texixml-to-stdout.patch ]; - nativeBuildInputs = [ makeWrapper perlPackages.perl texinfo libxslt ]; - buildInputs = [ groff libxml2 opensp libiconv iconv bash ] + strictDpes = true; + nativeBuildInputs = [ makeWrapper perlPackages.perl texinfo libxslt iconv ]; + buildInputs = [ groff libxml2 opensp libiconv bash ] ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]); postConfigure = '' diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index 93d2a7b5402e..5c22b71d2985 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.120.1"; + version = "1.120.2"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-14oBTAE5/bBSYce9esn9gdMW13CUhB5IKkw9v3Gn6Nc="; + sha256 = "sha256-zIpwR9tgv1vO2xI5DaLTY/eFuv91G4tlQAtJBi0pXfA="; }; meta = with lib; { diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 0c68cc60bb73..f5440856014f 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.45.1"; + version = "1.45.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-O5y3AdFOtxNwpt8uGkTC7XHY1M/6Cv3vTyeHyVlTRGw="; + sha256 = "sha256-yOAZJj+uqVcySLbS3dLw1nhn45G1x2MQTObs150iUs8="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-h9HE90mOaDid2/uZcDBKZdbi6K1P2o27LZDnLAm+XSE="; + vendorHash = "sha256-+q+zQKNwDPQ+6RJQj2pjhEFRxU+9kF1bgPIJB0YaTzk="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index cc124e2ed384..271654b92124 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.6.1"; + version = "5.6.2"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-v/a7Jc82QpH58c6pkki8xXZBi0v54oz03A2A/Oz3udU="; + hash = "sha256-w0stnSYIoxquy3PfbehpwlG5bnGVZWGy/8yNBpxYUSY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/earbuds/package.nix b/pkgs/by-name/ea/earbuds/package.nix index bbb2ff1cff11..68c5eab58fcf 100644 --- a/pkgs/by-name/ea/earbuds/package.nix +++ b/pkgs/by-name/ea/earbuds/package.nix @@ -54,10 +54,6 @@ rustPlatform.buildRustPackage { # versionCheckProgramArg = [ "--version" ]; # doInstallCheck = true; - passthru = { - updateScript = nix-update-script { }; - }; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd earbuds \ --bash <($out/bin/earbuds --generate bash) \ diff --git a/pkgs/by-name/ed/edencommon/glog-0.7.patch b/pkgs/by-name/ed/edencommon/glog-0.7.patch new file mode 100644 index 000000000000..1c9431c58c86 --- /dev/null +++ b/pkgs/by-name/ed/edencommon/glog-0.7.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d7b3454df..2ce7b5af1a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,8 +50,7 @@ + "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake" + ${CMAKE_MODULE_PATH}) + +-find_package(Glog MODULE REQUIRED) +-include_directories(${GLOG_INCLUDE_DIR}) ++find_package(Glog CONFIG REQUIRED) + + find_package(Gflags REQUIRED) + include_directories(${GFLAGS_INCLUDE_DIR}) +diff --git a/eden/common/testharness/CMakeLists.txt b/eden/common/testharness/CMakeLists.txt +index bef7421906..f35067efa9 100644 +--- a/eden/common/testharness/CMakeLists.txt ++++ b/eden/common/testharness/CMakeLists.txt +@@ -19,7 +19,7 @@ + ${BOOST_LIBRARIES} + Folly::folly_test_util + ${LIBGMOCK_LIBRARIES} +- ${GLOG_LIBRARY} ++ glog::glog + ) + + target_include_directories( diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 3623f1cbf71b..77cc3653952d 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -32,13 +32,17 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-pVPkH80vowdpwWv/h6ovEk335OeI6/0k0cAFhhFqSDM="; + hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag="; }; - patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # Test discovery timeout is bizarrely flaky on `x86_64-darwin` - ./increase-test-discovery-timeout.patch - ]; + patches = + [ + ./glog-0.7.patch + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Test discovery timeout is bizarrely flaky on `x86_64-darwin` + ./increase-test-discovery-timeout.patch + ]; nativeBuildInputs = [ cmake @@ -68,6 +72,22 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + checkPhase = '' + runHook preCheck + + # Skip flaky test + ctest -j $NIX_BUILD_CORES --output-on-failure ${ + lib.escapeShellArgs [ + "--exclude-regex" + (lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") [ + "ProcessInfoCache.addFromMultipleThreads" + ]) + ] + } + + runHook postCheck + ''; + postPatch = '' # The CMake build requires the FBThrift Python support even though # it’s not used, presumably because of the relevant code having diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 41e58b4cf308..6c78a1c78248 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.70"; + version = "0.71"; outputs = [ "out" "dev" ]; separateDebugInfo = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-2JPmS+OuK1cQyBRR0kDDWXBDUWUZuK/vsQ483GLu/S0="; + hash = "sha256-nbfWjV0zPPx2kcnD/aRaWSXUGIqrUX7Z4U45ASk5Ric="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/enpass/data.json b/pkgs/by-name/en/enpass/data.json index deb670846b53..412718362961 100644 --- a/pkgs/by-name/en/enpass/data.json +++ b/pkgs/by-name/en/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.10.1.1661_amd64.deb", - "sha256": "52e9a6819b186b83eb8d8b9e2d5d4f62dedbb24382819738c18cb28976e8b07b", - "version": "6.10.1.1661" + "path": "pool/main/e/enpass/enpass_6.11.6.1833_amd64.deb", + "sha256": "91a7f4ac1bee55106edc6f3e8236b8ef8ed985926482b058899e0c73075f0d56", + "version": "6.11.6.1833" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", diff --git a/pkgs/by-name/en/envision/autopatchelf.patch b/pkgs/by-name/en/envision/autopatchelf.patch new file mode 100644 index 000000000000..d1999e70cea6 --- /dev/null +++ b/pkgs/by-name/en/envision/autopatchelf.patch @@ -0,0 +1,205 @@ +diff --git a/src/builders/build_basalt.rs b/src/builders/build_basalt.rs +index e67e081..9ae1966 100644 +--- a/src/builders/build_basalt.rs ++++ b/src/builders/build_basalt.rs +@@ -6,6 +6,7 @@ use crate::{ + util::file_utils::rm_rf, + }; + use std::collections::{HashMap, VecDeque}; ++use std::env; + + pub fn get_build_basalt_jobs(profile: &Profile, clean_build: bool) -> VecDeque { + let mut jobs = VecDeque::::new(); +@@ -101,6 +102,21 @@ pub fn get_build_basalt_jobs(profile: &Profile, clean_build: bool) -> VecDeque VecDeque { + let mut jobs = VecDeque::::new(); +@@ -71,6 +72,21 @@ pub fn get_build_libsurvive_jobs(profile: &Profile, clean_build: bool) -> VecDeq + } + jobs.push_back(cmake.get_build_job()); + jobs.push_back(cmake.get_install_job()); ++ jobs.push_back(WorkerJob::new_cmd( ++ None, ++ "auto-patchelf".into(), ++ Some( ++ [ ++ vec![ ++ "--ignore-existing", ++ "--paths".into(), ++ build_dir.into_os_string().into_string().unwrap(), ++ "--libs".into(), ++ ], ++ env::var("libs").unwrap_or_default().split(":").map(|s| s.to_string()).collect(), ++ ].concat() ++ ), ++ )); + + jobs + } +diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs +index f379d6f..5710add 100644 +--- a/src/builders/build_monado.rs ++++ b/src/builders/build_monado.rs +@@ -9,6 +9,7 @@ use std::{ + collections::{HashMap, VecDeque}, + path::Path, + }; ++use std::env; + + pub fn get_build_monado_jobs(profile: &Profile, clean_build: bool) -> VecDeque { + let mut jobs = VecDeque::::new(); +@@ -83,6 +84,21 @@ pub fn get_build_monado_jobs(profile: &Profile, clean_build: bool) -> VecDeque VecDeque { + let mut jobs = VecDeque::::new(); +@@ -48,6 +49,21 @@ pub fn get_build_opencomposite_jobs(profile: &Profile, clean_build: bool) -> Vec + jobs.push_back(cmake.get_prepare_job()); + } + jobs.push_back(cmake.get_build_job()); ++ jobs.push_back(WorkerJob::new_cmd( ++ None, ++ "auto-patchelf".into(), ++ Some( ++ [ ++ vec![ ++ "--ignore-existing", ++ "--paths".into(), ++ build_dir.into_os_string().into_string().unwrap(), ++ "--libs".into(), ++ ], ++ env::var("libs").unwrap_or_default().split(":").map(|s| s.to_string()).collect(), ++ ].concat() ++ ), ++ )); + + jobs + } +diff --git a/src/builders/build_openhmd.rs b/src/builders/build_openhmd.rs +index 1157eca..534a895 100644 +--- a/src/builders/build_openhmd.rs ++++ b/src/builders/build_openhmd.rs +@@ -3,6 +3,7 @@ use crate::{ + util::file_utils::rm_rf, + }; + use std::{collections::VecDeque, path::Path}; ++use std::env; + + pub fn get_build_openhmd_jobs(profile: &Profile, clean_build: bool) -> VecDeque { + let mut jobs = VecDeque::::new(); +@@ -80,6 +81,22 @@ pub fn get_build_openhmd_jobs(profile: &Profile, clean_build: bool) -> VecDeque< + "install".into(), + ]), + )); ++ // autopatchelf job ++ jobs.push_back(WorkerJob::new_cmd( ++ None, ++ "auto-patchelf".into(), ++ Some( ++ [ ++ vec![ ++ "--ignore-existing", ++ "--paths".into(), ++ build_dir.into_os_string().into_string().unwrap(), ++ "--libs".into(), ++ ], ++ env::var("libs").unwrap_or_default().split(":").map(|s| s.to_string()).collect(), ++ ].concat() ++ ), ++ )); + + jobs + } +diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs +index f2a415d..a160186 100644 +--- a/src/builders/build_wivrn.rs ++++ b/src/builders/build_wivrn.rs +@@ -9,6 +9,7 @@ use std::{ + collections::{HashMap, VecDeque}, + path::Path, + }; ++use std::env; + + pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque { + let mut jobs = VecDeque::::new(); +@@ -60,6 +61,21 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque + $ +@@ -98,6 +97,7 @@ + fb303_thrift_cpp + Folly::folly + FBThrift::thrift ++ glog::glog + ) + + install( diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 9cb51f82e540..c8f621acd987 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -30,9 +30,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-3zQLX42qeOE2bbFmu4Kuvu0Fvq2mBq8YgkVGpyfwaak="; + hash = "sha256-SW1dRo1Wr14eHzYPg7Wm4QypFpNGXeaFlreEVWWyWgs="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/fb/fbthrift/glog-0.7.patch b/pkgs/by-name/fb/fbthrift/glog-0.7.patch new file mode 100644 index 000000000000..23cff743614c --- /dev/null +++ b/pkgs/by-name/fb/fbthrift/glog-0.7.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6b2b2a810..1813c88e42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,7 +106,7 @@ endif () + # Find required dependencies for thrift/lib + if (THRIFT_LIB_ONLY OR build_all) + find_package(Gflags REQUIRED) +- find_package(Glog REQUIRED) ++ find_package(Glog CONFIG REQUIRED) + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) +@@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all) + find_package(Threads) + include_directories( + ${LIBGFLAGS_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIRS} + ${Xxhash_INCLUDE_DIR} +diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists.txt +index afa28dad61..318860b3d6 100644 +--- a/thrift/example/cpp2/CMakeLists.txt ++++ b/thrift/example/cpp2/CMakeLists.txt +@@ -28,7 +28,7 @@ target_link_libraries( + thriftcpp2 + chatroom-cpp2 + ${LIBGFLAGS_LIBRARY} +- ${GLOG_LIBRARIES} ++ glog::glog + ) + install( + TARGETS example_server +diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt +index 6461588a86..8b6ed1b030 100644 +--- a/thrift/lib/cpp/CMakeLists.txt ++++ b/thrift/lib/cpp/CMakeLists.txt +@@ -45,7 +45,7 @@ target_link_libraries( + PUBLIC + Folly::folly + ${LIBGFLAGS_LIBRARY} +- ${GLOG_LIBRARIES} ++ glog::glog + ) + + add_library( +@@ -121,7 +121,7 @@ target_link_libraries( + Boost::boost + Folly::folly + wangle::wangle +- ${GLOG_LIBRARIES} ++ glog::glog + ${OPENSSL_LIBRARIES} + ) + +@@ -137,7 +137,7 @@ target_link_libraries( + thriftprotocol + transport + Folly::folly +- ${GLOG_LIBRARIES} ++ glog::glog + ) + + set(THRIFT1_HEADER_DIRS +diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt +index f941688ab0..b3609bbc62 100644 +--- a/thrift/lib/cpp2/CMakeLists.txt ++++ b/thrift/lib/cpp2/CMakeLists.txt +@@ -75,7 +75,7 @@ target_link_libraries( + Folly::folly + thriftmetadata + thriftprotocol +- ${GLOG_LIBRARIES} ++ glog::glog + ${LIBGFLAGS_LIBRARY} + ) + +@@ -206,7 +206,7 @@ target_link_libraries( + thrift + Folly::folly + wangle::wangle +- ${GLOG_LIBRARIES} ++ glog::glog + thrift-core + ) + diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index b602e6270dd7..649564e6f8b5 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,13 +39,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-dJf4vaIcat24WiKLFNEqeCnJYiO+c5YkuFu+hrS6cPE="; + hash = "sha256-VIWUh238MJDGxf6j/yanom9SNnNjBBzGbpg/SAquN5E="; }; patches = [ # Remove a line that breaks the build due to the CMake classic of # incorrect path concatenation. ./remove-cmake-install-rpath.patch + + ./glog-0.7.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/fizz/glog-0.7.patch b/pkgs/by-name/fi/fizz/glog-0.7.patch new file mode 100644 index 000000000000..263cce53baa9 --- /dev/null +++ b/pkgs/by-name/fi/fizz/glog-0.7.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index c60177c2b9..425326c529 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -50,7 +50,7 @@ + find_package(fmt CONFIG REQUIRED) + + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(Threads REQUIRED) + find_package(Zstd REQUIRED) + if (UNIX AND NOT APPLE) +@@ -198,7 +198,6 @@ + ${sodium_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIR} + PRIVATE +- ${GLOG_INCLUDE_DIRS} + ${FIZZ_INCLUDE_DIRECTORIES} + ) + +@@ -212,7 +211,7 @@ + ZLIB::ZLIB + ${ZSTD_LIBRARY} + PRIVATE +- ${GLOG_LIBRARIES} ++ glog::glog + ${GFLAGS_LIBRARIES} + ${FIZZ_LINK_LIBRARIES} + ${CMAKE_DL_LIBS} diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 157a900789a1..3d09d856ef4f 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ "bin" @@ -38,9 +38,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-mNe+CHEXhkwzek9qy2l6zvPXim9tJV44s+naSm6bQ4Q="; + hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/fo/folly/char_traits.patch b/pkgs/by-name/fo/folly/char_traits.patch new file mode 100644 index 000000000000..f82726384ac9 --- /dev/null +++ b/pkgs/by-name/fo/folly/char_traits.patch @@ -0,0 +1,29 @@ +diff --git a/folly/memory/test/UninitializedMemoryHacksTest.cpp b/folly/memory/test/UninitializedMemoryHacksTest.cpp +index 38e27c3..17424af 100644 +--- a/folly/memory/test/UninitializedMemoryHacksTest.cpp ++++ b/folly/memory/test/UninitializedMemoryHacksTest.cpp +@@ -283,7 +283,7 @@ TEST(UninitializedMemoryHacks, simpleStringWChar) { + } + + TEST(UninitializedMemoryHacks, simpleStringSChar) { +- testSimple>(); ++ testSimple>(); + } + + TEST(UninitializedMemoryHacks, simpleVectorChar) { +@@ -307,7 +307,7 @@ TEST(UninitializedMemoryHacks, randomStringWChar) { + } + + TEST(UninitializedMemoryHacks, randomStringSChar) { +- testRandom>(); ++ testRandom>(); + } + + TEST(UninitializedMemoryHacks, randomVectorChar) { +@@ -323,5 +323,5 @@ TEST(UninitializedMemoryHacks, randomVectorInt) { + } + + // We are deliberately putting this at the bottom to make sure it can follow use +-FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT(signed char) ++//FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT(char) + FOLLY_DECLARE_VECTOR_RESIZE_WITHOUT_INIT(int) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index e564965bf956..0ee9b228d6ea 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-CX4YzNs64yeq/nDDaYfD5y8GKrxBueW4y275edPoS0c="; + hash = "sha256-GxHOs6jfjiKQWWFs03O/sI92OvpPsf+Xilnawb8Nygs="; }; nativeBuildInputs = [ @@ -115,8 +116,20 @@ stdenv.mkDerivation (finalAttrs: { ] ); - # Temporary fix until next `staging` cycle. - doCheck = !stdenv.cc.isClang; + doCheck = true; + + patches = [ + # The base template for std::char_traits has been removed in LLVM 19 + # https://releases.llvm.org/19.1.0/projects/libcxx/docs/ReleaseNotes.html + ./char_traits.patch + + # + (fetchpatch { + name = "folly-fix-glog-0.7.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0"; + hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; + }) + ]; # https://github.com/NixOS/nixpkgs/issues/144170 postPatch = '' @@ -163,6 +176,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "buffered_atomic_test.BufferedAtomic.singleThreadUnguardedAccess" + "io_async_notification_queue_test.NotificationQueueTest.UseAfterFork" + "container_heap_vector_types_test.HeapVectorTypes.SimpleSetTes" ] ) ) diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/by-name/fo/fontforge-fonttools/package.nix similarity index 100% rename from pkgs/tools/misc/fontforge/fontforge-fonttools.nix rename to pkgs/by-name/fo/fontforge-fonttools/package.nix diff --git a/pkgs/by-name/fo/fontforge-gtk/package.nix b/pkgs/by-name/fo/fontforge-gtk/package.nix new file mode 100644 index 000000000000..08bcf0eac9d0 --- /dev/null +++ b/pkgs/by-name/fo/fontforge-gtk/package.nix @@ -0,0 +1,6 @@ +{ fontforge }: + +fontforge.override { + withSpiro = true; + withGTK = true; +} diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/by-name/fo/fontforge/package.nix similarity index 50% rename from pkgs/tools/misc/fontforge/default.nix rename to pkgs/by-name/fo/fontforge/package.nix index 1eca97e7d7c7..efe02f87dfcb 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/by-name/fo/fontforge/package.nix @@ -1,24 +1,47 @@ -{ stdenv, fetchFromGitHub, lib, fetchpatch -, cmake, uthash, pkg-config -, python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq -, withSpiro ? false, libspiro -, withGTK ? false, gtk3 -, withGUI ? withGTK -, withPython ? true -, withExtras ? true -, Carbon, Cocoa +{ + stdenv, + fetchFromGitHub, + lib, + fetchpatch, + replaceVars, + cmake, + uthash, + pkg-config, + python3, + freetype, + zlib, + glib, + giflib, + libpng, + libjpeg, + libtiff, + libxml2, + cairo, + pango, + readline, + woff2, + zeromq, + withSpiro ? false, + libspiro, + withGTK ? false, + gtk3, + withGUI ? withGTK, + withPython ? true, + withExtras ? true, }: assert withGTK -> withGUI; +let + py = python3.withPackages (ps: with ps; [ setuptools ]); +in stdenv.mkDerivation rec { pname = "fontforge"; version = "20230101"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "fontforge"; + repo = "fontforge"; rev = version; sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0="; }; @@ -29,14 +52,31 @@ stdenv.mkDerivation rec { url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch"; hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU="; }) - # Fixes translation compatibility with gettext 0.22 + + # Replace distutils use in the build script (fetchpatch { - url = "https://github.com/fontforge/fontforge/commit/55d58f87ab1440f628f2071a6f6cc7ef9626c641.patch"; - hash = "sha256-rkYnKPXA8Ztvh9g0zjG2yTUCPd3lE1uqwvBuEd8+Oyw="; + name = "replace-distutils.patch"; + url = "https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81.patch"; + includes = [ "pyhook/CMakeLists.txt" ]; + hash = "sha256-3CEwC8vygmCztKRmeD45aZIqyoj8yk5CLwxX2SGP7z4="; }) - # https://github.com/fontforge/fontforge/pull/5423 - ./replace-distutils.patch + # Fixes translation compatibility with gettext 0.22 + (fetchpatch { + name = "update-translation-compatibility.patch"; + url = "https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch"; + hash = "sha256-uO9uEhB64hkVa6O2tJKE8BLFR96m27d8NEN9UikNcvg="; + }) + + # Updates to new Python initialization API + (fetchpatch { + name = "modern-python-initialization-api.patch"; + url = "https://github.com/fontforge/fontforge/commit/2f2ba54c15c5565acbde04eb6608868cbc871e01.patch"; + hash = "sha256-qF4DqFpiZDbULi9+POPM73HF6pEot8BAFSVaVCNQrMU="; + }) + + # Provide a Nix-controlled location for the initial `sys.path` entry. + (replaceVars ./set-python-sys-path.patch { python = "${py}/${py.sitePackages}"; }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps @@ -51,19 +91,41 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ - readline uthash woff2 zeromq - python freetype zlib glib giflib libpng libjpeg libtiff libxml2 - ] - ++ lib.optionals withSpiro [ libspiro ] - ++ lib.optionals withGUI [ gtk3 cairo pango ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + nativeBuildInputs = [ + pkg-config + cmake + ]; - cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] + buildInputs = + [ + readline + uthash + woff2 + zeromq + py + freetype + zlib + glib + giflib + libpng + libjpeg + libtiff + libxml2 + ] + ++ lib.optionals withPython [ py ] + ++ lib.optionals withSpiro [ libspiro ] + ++ lib.optionals withGUI [ + gtk3 + cairo + pango + ]; + + cmakeFlags = + [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF" ++ lib.optional (!withGUI) "-DENABLE_GUI=OFF" ++ lib.optional (!withGTK) "-DENABLE_X11=ON" + ++ lib.optional (!withPython) "-DENABLE_PYTHON_SCRIPTING=OFF" ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON"; preConfigure = '' @@ -71,17 +133,14 @@ stdenv.mkDerivation rec { export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) ''; - postInstall = - # get rid of the runtime dependency on python - lib.optionalString (!withPython) '' - rm -r "$out/share/fontforge/python" - ''; - - meta = with lib; { + meta = { description = "Font editor"; homepage = "https://fontforge.github.io"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = [ maintainers.erictapen ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + philiptaron + ulysseszhan + ]; }; } diff --git a/pkgs/by-name/fo/fontforge/set-python-sys-path.patch b/pkgs/by-name/fo/fontforge/set-python-sys-path.patch new file mode 100644 index 000000000000..22b7057e9ac3 --- /dev/null +++ b/pkgs/by-name/fo/fontforge/set-python-sys-path.patch @@ -0,0 +1,21 @@ +Author: Philip Taron +Date: Sat Jan 4 12:22:38 2025 -0800 + + fontforge: add an initial value for `sys.path` + +diff --git a/fontforge/python.c b/fontforge/python.c +index e18d77d43..2e312eeb4 100644 +--- a/fontforge/python.c ++++ b/fontforge/python.c +@@ -19576,6 +19576,11 @@ void FontForge_InitializeEmbeddedPython(void) { + PyStatus status; + PyConfig_InitPythonConfig(&config); + ++ status = PyConfig_SetBytesString(&config, &config.pythonpath_env, "@python@"); ++ if (PyStatus_Exception(status)) { ++ fprintf(stderr, "Failed to set the Python search path: %s\n", status.err_msg); ++ } ++ + status = PyConfig_SetBytesString(&config, &config.program_name, + "fontforge"); + if (PyStatus_Exception(status)) { diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 270ad38eabf2..46d9a2d653d3 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -57,6 +57,7 @@ buildGoModule rec { changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md"; license = licenses.mit; maintainers = with maintainers; [ + adamcstephens kranzes emilylange christoph-heiss diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f4814467ee61..3d09cde6934a 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "9.0.3"; - hash = "sha256-Ig4iz/ZoRj4lyod73GWY2oRV3E3tx3S4rNqQtsTonzQ="; - npmDepsHash = "sha256-yDNlD1l5xuLkkp6LbOlWj9OYHO+WtiAeiu9oIoQLFL8="; - vendorHash = "sha256-JLruZi8mXR1f+o9Olhbz44ieEXVGinUNmVi24VEYj28="; + version = "10.0.0"; + hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY="; + npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8="; + vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fr/freecad/README.md b/pkgs/by-name/fr/freecad/README.md new file mode 100644 index 000000000000..b8dd940578ee --- /dev/null +++ b/pkgs/by-name/fr/freecad/README.md @@ -0,0 +1,7 @@ +This package supports the following parameters: + +- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb +- spaceNavSupport (enabled by default on linux): whether to enable + [spacenavd support](https://spacenav.sourceforge.net/) +- ifcSupport (default: false): whether to enable ifc support through + ifcopenshell diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 551269240c4c..f840898d4804 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -23,6 +23,7 @@ , pkg-config , python311Packages , spaceNavSupport ? stdenv.hostPlatform.isLinux +, ifcSupport ? false , stdenv , swig , vtk @@ -47,6 +48,7 @@ let inherit (python311Packages) boost gitpython + ifcopenshell matplotlib pivy ply @@ -126,6 +128,9 @@ freecad-utils.makeCustomizable (stdenv.mkDerivation (finalAttrs: { ++ lib.optionals spaceNavSupport [ libspnav qtx11extras + ] + ++ lib.optionals ifcSupport [ + ifcopenshell ]; patches = [ diff --git a/pkgs/by-name/fr/freecad/tests/default.nix b/pkgs/by-name/fr/freecad/tests/default.nix index 26fa5db07640..954aadaf17ff 100644 --- a/pkgs/by-name/fr/freecad/tests/default.nix +++ b/pkgs/by-name/fr/freecad/tests/default.nix @@ -1,7 +1,9 @@ { callPackage, + freecad, }: { python-path = callPackage ./python-path.nix { }; modules = callPackage ./modules.nix { }; + withIfcSupport = freecad.override { ifcSupport = true; }; } diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index ad176149074e..e0b98cfb0c8a 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -4,6 +4,8 @@ rustPlatform, fetchFromGitHub, + jq, + moreutils, fetchNpmDeps, npmHooks, nodejs, @@ -18,15 +20,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gale"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-yAfQuLfucz522ln0YNMy8nppp2jk6tGJnP/WhK7JdhI="; + hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA="; }; + postPatch = '' + jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + ''; + npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; @@ -34,9 +40,13 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-u7UbC9TyEQwYpcVWt8/NsweDNWbQi6NuD9ay9gmMDjg="; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; + hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg="; }; cargoRoot = "src-tauri"; @@ -44,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { buildAndTestSubdir = finalAttrs.cargoRoot; nativeBuildInputs = [ + jq + moreutils npmHooks.npmConfigHook nodejs rustPlatform.cargoSetupHook diff --git a/pkgs/by-name/ga/gama-tui/package.nix b/pkgs/by-name/ga/gama-tui/package.nix index 92c0ce09a019..c99ff9a6ac3e 100644 --- a/pkgs/by-name/ga/gama-tui/package.nix +++ b/pkgs/by-name/ga/gama-tui/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gama-tui"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "termkit"; repo = "gama"; tag = "v${version}"; - hash = "sha256-ZMM+Nt/9Bqmx7kzlhZM8I++BYZhwilRjNXSTAmOrxk4="; + hash = "sha256-ISgORjzH7ZigQYm7PSA4ZClhpw2GU7yor580fEf5UNc="; }; vendorHash = "sha256-PTyrSXLMr244+ZTvjBBUc1gmwYXBAs0bXZS2t3aSWFQ="; diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix index f4bc572b513d..7fb5dd5eb010 100644 --- a/pkgs/by-name/ga/gargoyle/package.nix +++ b/pkgs/by-name/ga/gargoyle/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVarsWith, jam, cctools, pkg-config, @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { installPhase = if stdenv.hostPlatform.isDarwin then - (substituteAll { - inherit (stdenv) shell; + (replaceVarsWith { + replacements = { inherit (stdenv) shell; }; isExecutable = true; src = ./darwin.sh; }) diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix index 0d3a8cc360ea..acd4ebe7fc4a 100644 --- a/pkgs/by-name/gb/gbenchmark/package.nix +++ b/pkgs/by-name/gb/gbenchmark/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - hash = "sha256-5cl1PIjhXaL58kSyWZXRWLq6BITS2BwEovPhwvk2e18="; + hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index d6a69fa6da01..fc9b54a84b27 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, stdenv, curl, - autoreconfHook, pkg-config, byacc, flex, @@ -11,17 +10,16 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.2.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; - rev = version; - hash = "sha256-extVTaTWVFXSTiXlZ/MtiiFdc/KZEDkc+A7xxylJaM4="; + rev = "v${version}"; + hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis="; }; nativeBuildInputs = [ - autoreconfHook pkg-config byacc flex diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix index f4bf90f780ef..d15dc047adc0 100644 --- a/pkgs/by-name/ge/gemrb/package.nix +++ b/pkgs/by-name/ge/gemrb/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-n01Q/27iYXahBbUDFHW1Q3lPqCtTvhstUBgownZbKtg="; + hash = "sha256-+aPnOJQGRblqcrblVU5ZwA8CZqeT19rxEtn3GLuofYU="; }; buildInputs = [ diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index 522d3431280f..c032eaf3c222 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-GRTBYwphw5rpwFzLrBRpzz6z6udNCdPn3vanfMvBtGI="; + hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.12.0/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.13.0/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index ccf1daa72ffb..d54d17a64433 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -112,7 +112,17 @@ stdenv.mkDerivation rec { sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac + # Sidestep a bug in autoconf-2.69 that sets the compiler for all checks to + # $CXX after the part for the vendored copy of tesseract. + # `--without-tesseract` is already passed to the outer ./configure, here we + # make sure it is also passed to its recursive invocation for buildPlatform + # checks when cross-compiling. + substituteInPlace configure.ac \ + --replace-fail "--without-x" "--without-x --without-tesseract" + autoconf + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DARWIN_LDFLAGS_SO_PREFIX=$out/lib/ ''; configureFlags = [ @@ -147,14 +157,6 @@ stdenv.mkDerivation rec { ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" ''; - # dynamic library name only contains major version number, eg. '10' - dylib_version = lib.versions.major version; - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in $out/bin/{gs,gsc,gsx}; do - install_name_tool -change libgs.$dylib_version.dylib $out/lib/libgs.$dylib_version.dylib $file - done - ''; - # validate dynamic linkage doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index ff2f1591175b..11eaa3d06239 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "0.22.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-xXatX0U4JBlsH1uLT9l5+FZj52zGyP9XztMa8eQ8eWk="; + hash = "sha256-HpFdebG4pRa+g2ycOOfnWgN/+DcYdPHAN/RHBHN6S8A="; }; - cargoHash = "sha256-yGxty10EJXLsNV4zW89X5W1y2jY/cWpmiJ9PgOtqKCo="; + cargoHash = "sha256-CS3MkCumqHmTcRf/YJr/M8s7BoGos/ixXm97BCCXBvw="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix index 2bbd9a22c900..468618c604d9 100644 --- a/pkgs/by-name/gi/gitwatch/package.nix +++ b/pkgs/by-name/gi/gitwatch/package.nix @@ -4,7 +4,10 @@ makeWrapper, fetchFromGitHub, + coreutils, git, + gnugrep, + gnused, openssh, inotify-tools, }: @@ -41,7 +44,10 @@ runCommand "gitwatch" wrapProgram $dest \ --prefix PATH ';' ${ lib.makeBinPath [ + coreutils git + gnugrep + gnused inotify-tools openssh ] diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 53cb4efe2f13..5556e85f8566 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.82.1"; + version = "2.82.4"; outputs = [ "bin" @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-R4Y0RAv1LuTsRCjVWHhzmMC+awQ8UhvrMIM0s9tEiaY="; + hash = "sha256-N90Id/6WTNFemicQsEShgw+xvZNlKm0Mtriy3/GHxwk="; }; patches = diff --git a/pkgs/by-name/gl/glib/setup-hook.sh b/pkgs/by-name/gl/glib/setup-hook.sh index 9eabf8a679a9..40336f297283 100644 --- a/pkgs/by-name/gl/glib/setup-hook.sh +++ b/pkgs/by-name/gl/glib/setup-hook.sh @@ -14,7 +14,7 @@ glibPreInstallPhase() { } appendToVar preInstallPhases glibPreInstallPhase -glibPreFixupPhase() { +glibPostInstallHook() { # Move gschemas in case the install flag didn't help if [ -d "$prefix/share/glib-2.0/schemas" ]; then mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" @@ -25,10 +25,7 @@ glibPreFixupPhase() { } # gappsWrapperArgsHook expects GSETTINGS_SCHEMAS_PATH variable to be set by this. -# Until we have dependency mechanism in generic builder, we need to use this ugly hack. -if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then - preFixupPhases+=" " - preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / glibPreFixupPhase gappsWrapperArgsHook }" -else - preFixupPhases+=" glibPreFixupPhase" -fi +# Until we have dependency mechanism in generic builder, we need to use this hack. +# This relies on the fact that postInstallHooks are run *after* postInstall passed to +# mkDerivation. +postInstallHooks+=(glibPostInstallHook) diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index 762b49a68e95..ed30b55a60f4 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "glog"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "google"; repo = "glog"; rev = "v${version}"; - sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; + sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gm/gmailctl/package.nix b/pkgs/by-name/gm/gmailctl/package.nix index b701b17923a0..900157a20cce 100644 --- a/pkgs/by-name/gm/gmailctl/package.nix +++ b/pkgs/by-name/gm/gmailctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.7"; + version = "0.11.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - hash = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; + hash = "sha256-euYl7GKidkOFsSxrEnSBIdBNZOKuBBaS3LNQOZy9R9g="; }; - vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; + vendorHash = "sha256-OXz6GlpC9yhe4pRuVxTUUruJyxBQ63JC4a8xwtuDM/o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gn/gnumake42/package.nix b/pkgs/by-name/gn/gnumake42/package.nix index dc323447af9b..2d7b0394a004 100644 --- a/pkgs/by-name/gn/gnumake42/package.nix +++ b/pkgs/by-name/gn/gnumake42/package.nix @@ -33,17 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = - lib.optional guileSupport "--with-guile" - - # Make uses this test to decide whether it should keep track of - # subseconds. Apple made this possible with APFS and macOS 10.13. - # However, we still support macOS 10.11 and 10.12. Binaries built - # in Nixpkgs will be unable to use futimens to set mtime less than - # a second. So, tell Make to ignore nanoseconds in mtime here by - # overriding the autoconf test for the struct. - # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + configureFlags = lib.optional guileSupport "--with-guile"; outputs = [ "out" diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix index ffb17d92b2f6..f4df089c084a 100644 --- a/pkgs/by-name/go/go-blueprint/package.nix +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-blueprint"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "Melkeydev"; repo = "go-blueprint"; rev = "v${version}"; - hash = "sha256-CTmizd0OnSKHXhhfzRxG31kcnIRSRHZE1LuR7qjBlm8="; + hash = "sha256-/MIMDQKdpgY0bCwrYpJNC6jiEhNECROe61uuoFz8P68="; }; ldflags = [ diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix index 662ab8d64db9..fe1d1bf60921 100644 --- a/pkgs/by-name/go/go-task/package.nix +++ b/pkgs/by-name/go/go-task/package.nix @@ -4,25 +4,22 @@ buildGoModule, fetchFromGitHub, installShellFiles, - testers, nix-update-script, - go-task, + versionCheckHook, }: buildGoModule rec { pname = "go-task"; - version = "3.40.1"; + version = "3.41.0"; src = fetchFromGitHub { owner = "go-task"; repo = "task"; tag = "v${version}"; - hash = "sha256-jQKPTKEzTfzqPlNlKFMduaAhvDsogRv3vCGtZ4KP/O4="; + hash = "sha256-yJ9XTCS0BK+pcQvcbGR2ixwPODJKdfQnHgB1QoTFhzA="; }; - vendorHash = "sha256-bw9NaJOMMKcKth0hRqNq8mqib/5zLpjComo0oj22A/U="; - - doCheck = false; + vendorHash = "sha256-DR9G+I6PYk8jrR0CZiPqtuULTMekATNSLjyHACOmlbk="; nativeBuildInputs = [ installShellFiles ]; @@ -47,15 +44,14 @@ buildGoModule rec { --zsh <($out/bin/task --completion zsh) ''; - passthru = { - tests = { - version = testers.testVersion { - package = go-task; - }; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/task"; + versionCheckProgramArg = [ "--version" ]; - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://taskfile.dev/"; diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index 1567b10e3549..7738bcda8d90 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lStaMj2f8lQZx2E42o4ikPmFQzydlN3PFKwFvUx37SI="; + sha256 = "sha256-+JMit0loxT5KOupqL5bkO3pcAfuiN8YAw0ueUh9mUJI="; }; - vendorHash = "sha256-ir7FR7ndbPhzUOCVPrYO0SEe03wDFIP74I4X6HJxtE8="; + vendorHash = "sha256-9qYmErARMIxnbECANO66m6fPwoR8YQlJzP/VcK9tfP4="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 90ec7681d8c4..e2f36205960d 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.264"; + version = "132.0.6834.83"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-zfPXkfjnvVGO09X4eqTii7rPwieMEsQMy9p9tXb5fDU="; + hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.265"; + version = "132.0.6834.84"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/accjagybvz5mf6voljw3khsklaaa_131.0.6778.265/GoogleChrome-131.0.6778.265.dmg"; - hash = "sha256-mHfBmBJVlUYQf8UnCBBTbgizTuV/IucXg2H+i4zhnPU="; + url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg"; + hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo="; }; dontPatch = true; diff --git a/pkgs/by-name/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix index ac7e7fb909d0..61b4ad9be469 100644 --- a/pkgs/by-name/gp/gpick/package.nix +++ b/pkgs/by-name/gp/gpick/package.nix @@ -2,11 +2,10 @@ stdenv, fetchFromGitHub, cmake, - wrapGAppsHook3, boost, - pkg-config, - gtk3, ragel, + pkg-config, + wrapGAppsHook3, lua, fetchpatch, lib, @@ -28,19 +27,28 @@ stdenv.mkDerivation rec { ./dot-version.patch (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/1d53a9aace4bb60300e52458bb1577d248cb87cd/trunk/buildfix.diff"; + url = "https://patch-diff.githubusercontent.com/raw/thezbyg/gpick/pull/227.patch"; + hash = "sha256-qYspUctvlPMEK/c2hMUxYc5EYdG//CBcN2PluTtXiFc="; + }) + + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gpick/-/raw/0.3-2/buildfix.diff"; hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0="; }) ]; + # https://github.com/thezbyg/gpick/pull/227 + postPatch = '' + sed '1i#include ' -i source/dynv/Types.cpp + ''; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; + buildInputs = [ boost - gtk3 ragel lua ]; diff --git a/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch b/pkgs/by-name/gr/gramps/check-locale-hasattr-textdomain.patch similarity index 100% rename from pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch rename to pkgs/by-name/gr/gramps/check-locale-hasattr-textdomain.patch diff --git a/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch b/pkgs/by-name/gr/gramps/disable-gtk-warning-dialog.patch similarity index 100% rename from pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch rename to pkgs/by-name/gr/gramps/disable-gtk-warning-dialog.patch diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/by-name/gr/gramps/package.nix similarity index 86% rename from pkgs/applications/misc/gramps/default.nix rename to pkgs/by-name/gr/gramps/package.nix index 91e1e5853cf8..1c3aed85a1c3 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/by-name/gr/gramps/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, gtk3, - pythonPackages, + python3Packages, glibcLocales, intltool, gexiv2, @@ -21,10 +21,10 @@ }: let - inherit (pythonPackages) buildPythonApplication pythonOlder; + inherit (python3Packages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.2.3"; + version = "5.2.4"; pname = "gramps"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; tag = "v${version}"; - hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8="; + hash = "sha256-Jue5V4pzfd1MaZwEhkGam+MhNjaisio7byMBPgGmiFg="; }; patches = [ @@ -49,15 +49,15 @@ buildPythonApplication rec { intltool gettext gobject-introspection - pythonPackages.setuptools + python3Packages.setuptools ]; nativeCheckInputs = [ glibcLocales - pythonPackages.unittestCheckHook - pythonPackages.jsonschema - pythonPackages.mock - pythonPackages.lxml + python3Packages.unittestCheckHook + python3Packages.jsonschema + python3Packages.mock + python3Packages.lxml ]; buildInputs = @@ -76,7 +76,7 @@ buildPythonApplication rec { # Ghostscript support ++ lib.optional enableGhostscript ghostscript; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ berkeleydb pyicu pygobject3 diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index 53d601c0ee77..c5884fdce8b0 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -8,20 +8,20 @@ python3Packages.buildPythonApplication rec { pname = "granian"; - version = "1.6.2"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; rev = "v${version}"; - hash = "sha256-BuGavjNgA2xsp1f1KGQ9JYmAYVL779EC5jDzuRXAjYg="; + hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-x/qyNnIUqEgh8fyzn7g4dw7KQxn71l+vlar04PaVI7c="; + hash = "sha256-NiDGVQGKo+aku1is8OpRavuSalxLc5XfLai0XdtxUMA="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 118646c619ae..c4e674255837 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "gumbo"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; - hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; + hash = "sha256-C5+MCQ/hC+lfjxPykiAJspYQtI1G7/mFa4XlPrDJl/c="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch b/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch new file mode 100644 index 000000000000..2fe3ae78a1a4 --- /dev/null +++ b/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch @@ -0,0 +1,37 @@ +diff --git a/src/hhd/plugins/power/power.py b/src/hhd/plugins/power/power.py +index 5ece857..be41542 100644 +--- a/src/hhd/plugins/power/power.py ++++ b/src/hhd/plugins/power/power.py +@@ -79,12 +79,6 @@ def create_subvol(): + ) + return + +- # Fixup selinux for swap +- subprocess.run( +- ["semanage", "fcontext", "-a", "-t", "var_t", HHD_SWAP_SUBVOL], +- ) +- subprocess.run(["restorecon", HHD_SWAP_SUBVOL]) +- + logger.info(f"Creating swap subvolume {HHD_SWAP_SUBVOL}") + os.system(f"btrfs subvolume create {HHD_SWAP_SUBVOL}") + +@@ -153,19 +147,6 @@ def create_temporary_swap(): + subprocess.run(["chmod", "600", HHD_SWAP_FILE], check=True) + subprocess.run(["mkswap", HHD_SWAP_FILE], check=True) + +- # Fixup selinux for swap +- subprocess.run( +- [ +- "semanage", +- "fcontext", +- "-a", +- "-t", +- "swapfile_t", +- HHD_SWAP_FILE, +- ], +- ) +- subprocess.run(["restorecon", HHD_SWAP_FILE]) +- + # Enable swap + subprocess.run(["swapon", HHD_SWAP_FILE], check=True) + diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 1c11cd3b59b2..aad4a57e50c2 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -11,19 +11,25 @@ efibootmgr, dbus, lsof, + btrfs-progs, + util-linux, }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.9.0"; + version = "3.10.2"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-y3CxdWqQEwdNYs4m1NEUeRjTvvhEpS5S739wyFlluWo="; + hash = "sha256-6BjXqqNe2u/rh1cnuJ13L/1KimprcyatIr53b0GOBSM="; }; + # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. + # NixOS doesn't support selinux so we can safely remove them + patches = [ ./0001-remove-selinux-fixes.patch ]; + # This package relies on several programs expected to be on the user's PATH. # We take a more reproducible approach by patching the absolute path to each of these required # binaries. @@ -41,8 +47,16 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/hhd/controller/physical/imu.py \ --replace-fail '"modprobe' '"${lib.getExe' kmod "modprobe"}' - substituteInPlace src/hhd/plugins/overlay/power.py \ - --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' + substituteInPlace src/hhd/plugins/power/power.py \ + --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' \ + --replace-fail '"systemctl"' '"${lib.getExe' systemd "systemctl"}"' \ + --replace-fail '"stat"' '"${lib.getExe' coreutils "stat"}"' \ + --replace-fail '"swapon"' '"${lib.getExe' util-linux "swapon"}"' \ + --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"' \ + --replace-fail '"fallocate"' '"${lib.getExe' util-linux "fallocate"}"' \ + --replace-fail '"chmod"' '"${lib.getExe' coreutils "chmod"}"' \ + --replace-fail '"mkswap"' '"${lib.getExe' util-linux "mkswap"}"' \ + --replace-fail '"btrfs",' '"${lib.getExe' btrfs-progs "btrfs"}",' substituteInPlace src/hhd/device/oxp/serial.py \ --replace-fail "udevadm" "${lib.getExe' systemd "udevadm"}" diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix index 4b9eff1b10dc..3cc546a630ad 100644 --- a/pkgs/by-name/ha/hanko/package.nix +++ b/pkgs/by-name/ha/hanko/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, installShellFiles, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,10 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-rlKFS1ppUoyZ1X2PeG8tEB44Ysqi7kCLqR+ECVIdPjs="; + passthru = { + updateScript = nix-update-script { }; + }; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 1bee6d3f4447..5481f4f62aef 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; tag = "hatch-v${version}"; - hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY="; + hash = "sha256-JwFPNoFoNqAXkLCGhliLN98VAS+VCwRzo+JqWLIrxsw="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; @@ -74,6 +74,19 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + # AssertionError on the version metadata + # https://github.com/pypa/hatch/issues/1877 + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_files" + "--deselect=tests/backend/metadata/test_spec.py::TestProjectMetadataFromCoreMetadata::test_license_files" + ]; + disabledTests = [ # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) @@ -117,14 +130,21 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)] - # At index 0 diff: - # call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh') - # != call('test hatch-test.py3.10', shell=True) - "tests/cli/fmt/test_fmt.py" - "tests/cli/test/test_test.py" - ]; + disabledTestPaths = + [ + # ModuleNotFoundError: No module named 'hatchling.licenses.parse' + # https://github.com/pypa/hatch/issues/1850 + "tests/backend/licenses/test_parse.py" + "tests/backend/licenses/test_supported.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)] + # At index 0 diff: + # call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh') + # != call('test hatch-test.py3.10', shell=True) + "tests/cli/fmt/test_fmt.py" + "tests/cli/test/test_test.py" + ]; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 57287dd46093..4c1360184bb0 100644 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-XpC/LLqB5EwvI2MwnR2x142UtG5WEt5Wwbhx6gdNJ68="; + hash = "sha256-OX9kjGGdIvsaaGwNq7IbyD5B7AmlH1wHiR6P4uIOdi8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ht/httpie-desktop/package.nix b/pkgs/by-name/ht/httpie-desktop/package.nix index 42e2395299c9..745ada5f71a2 100644 --- a/pkgs/by-name/ht/httpie-desktop/package.nix +++ b/pkgs/by-name/ht/httpie-desktop/package.nix @@ -7,18 +7,18 @@ appimageTools.wrapType2 rec { pname = "httpie-desktop"; - version = "2024.1.2"; + version = "2025.1.0"; src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}-arm64.AppImage"; - hash = "sha256-RhIyLakCkMUcXvu0sgl5MtV4YXXkqqH1UUS7bptUzww="; + hash = "sha256-YadVCoBNFFco4773COyJOGHtbFKW1zMzi5kazWqIGbY="; } else fetchurl { url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; - hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; + hash = "sha256-8Ecamw+rmY3iun8ytMsJW3gGHLNcyuZ7VkOiNfiDEyk="; }; extraInstallCommands = @@ -34,11 +34,11 @@ appimageTools.wrapType2 rec { --replace-fail 'Exec=AppRun' 'Exec=httpie-desktop' ''; - meta = with lib; { + meta = { description = "Cross-platform API testing client for humans. Painlessly test REST, GraphQL, and HTTP APIs"; homepage = "https://github.com/httpie/desktop"; - license = licenses.unfree; - maintainers = with maintainers; [ luftmensch-luftmensch ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "httpie-desktop"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 10b24a35a2e6..748727e61fe7 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.390"; + version = "0.391"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-DexmtBKe1rrmvHMVk8P20hBLfdP1x6CWx/F1s4lDnK4="; + hash = "sha256-GF3UCx/CE4ByQTsDeRFqlBUoKwGjmTi+7/JE65U7H+o="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index 53c8a2de9bc4..ddd96ffb3042 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -39,12 +39,6 @@ stdenv.mkDerivation rec { libxcrypt ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. - # A commit to revert this change will be included in the fix PR targeting staging. - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - # Don't use help2man if cross-compiling # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 03799ae2faf5..33ac44c47dc3 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ingress2gateway"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - hash = "sha256-xAoJREGktbSNGYdrmPuYG2G+xaQ+kReSSA1JBgWaPVY="; + hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I="; }; - vendorHash = "sha256-T6I8uYUaubcc1dfDu6PbQ9bDDLqGuLGXWnCZhdvkycE="; + vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/invidious/videojs.sh b/pkgs/by-name/in/invidious/videojs.sh index 31609db14eb3..9272d0b0e285 100644 --- a/pkgs/by-name/in/invidious/videojs.sh +++ b/pkgs/by-name/in/invidious/videojs.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - unpackPhase cd source # this helper downloads the videojs files and checks their checksums diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index c0f90732706e..70d9cf242b53 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -8,7 +8,6 @@ gnused, makeWrapper, nix, - nixfmt-classic, openjdk, writeScript, nixosTests, @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { gnused jq nix - nixfmt-classic ] } @@ -70,9 +68,6 @@ stdenv.mkDerivation rec { if [ ! "$oldVersion" = "$version" ]; then update-source-version jenkins "$version" "$hash" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/by-name/je/jenkins/package.nix" - nixfmt "$default_nix" else echo "jenkins is already up-to-date" fi diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix index ba38e333430d..9722f53dba4e 100644 --- a/pkgs/by-name/js/json-glib/package.nix +++ b/pkgs/by-name/js/json-glib/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, docutils, glib, meson, @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.10.0"; + version = "1.10.6"; outputs = [ "out" @@ -34,19 +33,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "G8qNZtlhBuzBR98xM7laW7eE8fpvFdBt18Go+0oQr3s="; + hash = "sha256-d/S8v5M5Uo8Wa4BzRYaT8KILd7cFnbwtthdGoZKLApM="; }; patches = [ # Add option for changing installation path of installed tests. ./meson-add-installed-tests-prefix-option.patch - - # Restore single quote string extension - # https://gitlab.gnome.org/GNOME/json-glib/-/issues/76 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/json-glib/-/commit/2a26bd3dedc3b27471e6df210d76333d3d41159c.patch"; - hash = "sha256-U/jWB4wneN4MwZO3vAfI9Z7UT/SLMNEx/X8NMsCO8I4="; - }) ]; strictDeps = true; diff --git a/pkgs/by-name/k2/k2pdfopt/package.nix b/pkgs/by-name/k2/k2pdfopt/package.nix index 08771f9b1942..8feb2b25d2b5 100644 --- a/pkgs/by-name/k2/k2pdfopt/package.nix +++ b/pkgs/by-name/k2/k2pdfopt/package.nix @@ -61,7 +61,6 @@ let patchCommands, }: runCommand "${name}-k2pdfopt.patch" { inherit src; } '' - source $stdenv/setup unpackPhase orig=$sourceRoot diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix index 2db418ecc0a7..4bf9cb4325b9 100644 --- a/pkgs/by-name/kb/kbd/package.nix +++ b/pkgs/by-name/kb/kbd/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.6.4"; + version = "2.7.1"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-UZ+NCHrsyn4KM80IS++SwGbrGXMWZmU9zHDJ1xqkCSY="; + sha256 = "sha256-8WfYmdkrVszxL29JNVFz+ThwqV8V2K7r9f3NKKYhrKg="; }; # vlock is moved into its own output, since it depends on pam. This @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`. substituteInPlace src/libkbdfile/kbdfile.c \ - --replace 'gzip ' '${gzip}/bin/gzip ' \ - --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \ - --replace 'xz ' '${xz.bin}/bin/xz ' \ - --replace 'zstd ' '${zstd.bin}/bin/zstd ' + --replace-fail 'gzip ' '${gzip}/bin/gzip ' \ + --replace-fail 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \ + --replace-fail 'xz ' '${xz.bin}/bin/xz ' \ + --replace-fail 'zstd ' '${zstd.bin}/bin/zstd ' sed -i ' 1i prefix:=$(vlock) diff --git a/pkgs/by-name/kb/kbd/search-paths.patch b/pkgs/by-name/kb/kbd/search-paths.patch index 61e8918017c2..4d51f7d05564 100644 --- a/pkgs/by-name/kb/kbd/search-paths.patch +++ b/pkgs/by-name/kb/kbd/search-paths.patch @@ -41,7 +41,7 @@ Without this patch, kbd will only look inside }; @@ -55,5 +58,6 @@ static const char *const unisuffixes[] = { /* hide partial fonts a bit - loading a single one is a bad idea */ - const char *const partfontdirpath[] = { + static const char *const partfontdirpath[] = { + "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", NULL @@ -68,13 +68,14 @@ Without this patch, kbd will only look inside --- a/src/setfont.c +++ b/src/setfont.c @@ -48,8 +48,8 @@ usage(void) - " -v Be verbose.\n" - " -C Indicate console device to be used.\n" - " -V Print version and exit.\n" -- "Files are loaded from the current directory or %s/*/.\n"), -- DATADIR); -+ "Files are loaded from the current directory or %s/*/ or %s/*/.\n"), -+ DATADIR, "/etc/kbd"); - exit(EX_USAGE); + "\n" +- "Files are loaded from the %s/*/.\n"), +- DATADIR); ++ "Files are loaded from the %s/*/ or %s/*/.\n"), ++ DATADIR, "/etc/kbd"); + + print_report_bugs(); + + exit(retcode); } diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index 54a415cb8353..c23db4d772d0 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -11,7 +11,7 @@ # runtime withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, - boost, + boost186, libmysqlclient, log4cplus, openssl, @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sphinxRoot = "doc/sphinx"; buildInputs = [ - boost + boost186 # does not build with 1.87 yet, see https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523 libmysqlclient log4cplus openssl diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix index f8ecb0815b02..a013880e6c96 100644 --- a/pkgs/by-name/ki/kirc/package.nix +++ b/pkgs/by-name/ki/kirc/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU="; + hash = "sha256-LiJZnFQMnyBEqeyyyqM56XXoYjbZPCWLfLX9OB/f+YM="; }; dontConfigure = true; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index af3701444243..cb99bd032eb5 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-6q7ZtTdbH2nIPIm6gNQZz2QxHlbWULsflhWJ0aDMFH4="; + sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kotlin-language-server/package.nix b/pkgs/by-name/ko/kotlin-language-server/package.nix index b257d2fd1256..e9bd6b1aecbc 100644 --- a/pkgs/by-name/ko/kotlin-language-server/package.nix +++ b/pkgs/by-name/ko/kotlin-language-server/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.3.12"; + version = "1.3.13"; src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-poWaU0vZS1cpMbbvN7/s1RRUKhekdfTi08fF/IZsVGs="; + hash = "sha256-ypiOeXA+14Js31WPGJAdSjskQJR9sBPVWGecLkKHiN4="; }; dontBuild = true; diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix index d67e5b2718b9..86959409db00 100644 --- a/pkgs/by-name/ku/kubecm/package.nix +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubecm"; - version = "0.32.1"; + version = "0.32.2"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-qB3Xzw6nWViBd2QMa3gBLrYhflalkjyLqeyl+7ICoSA="; + hash = "sha256-cW96teV0k0MJq6WJ37Ao4tDOOsB48uU2+WTD07n5EuQ="; }; vendorHash = "sha256-Fr31wLvzIoN2wIU2EmUrsqiMcPpdJpQI3ZfB//JYIXE="; diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index cadef746e793..2729483f3343 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1607"; + version = "1608"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-AHaKE9il4GZ5JhCqmScqG/rTHEOA8+A421pbdrDHZeY="; + hash = "sha256-enTw68QklAJ6iz5L8y0R6ss6gAUFERfqdUMhJnPtePk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index d78841ef5c85..17af27ccd36b 100644 --- a/pkgs/by-name/lc/lcms2/package.nix +++ b/pkgs/by-name/lc/lcms2/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "out" ]; - propagatedBuildInputs = [ + buildInputs = [ libtiff libjpeg zlib diff --git a/pkgs/by-name/li/libabw/package.nix b/pkgs/by-name/li/libabw/package.nix index 083e4ad7be0a..a6c8be817e80 100644 --- a/pkgs/by-name/li/libabw/package.nix +++ b/pkgs/by-name/li/libabw/package.nix @@ -27,14 +27,16 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost + nativeBuildInputs = [ doxygen gperf + perl + pkg-config + ]; + buildInputs = [ + boost librevenge libxml2 - perl zlib ]; diff --git a/pkgs/by-name/li/libajantv2/device-info-list.patch b/pkgs/by-name/li/libajantv2/device-info-list.patch new file mode 100644 index 000000000000..c4351ecee00c --- /dev/null +++ b/pkgs/by-name/li/libajantv2/device-info-list.patch @@ -0,0 +1,13 @@ +diff --git a/ajantv2/src/ntv2devicescanner.cpp b/ajantv2/src/ntv2devicescanner.cpp +index 448e48d372..6b46f9f69d 100644 +--- a/ajantv2/src/ntv2devicescanner.cpp ++++ b/ajantv2/src/ntv2devicescanner.cpp +@@ -137,7 +137,7 @@ + } + #endif // !defined(NTV2_DEPRECATE_16_3) + +-NTV2DeviceInfoList GetDeviceInfoList (void) ++NTV2DeviceInfoList CNTV2DeviceScanner::GetDeviceInfoList (void) + { + AJAAutoLock tmpLock(&sDevInfoListLock); + return sDevInfoList; diff --git a/pkgs/by-name/li/libajantv2/musl.patch b/pkgs/by-name/li/libajantv2/musl.patch new file mode 100644 index 000000000000..d27e9b7495da --- /dev/null +++ b/pkgs/by-name/li/libajantv2/musl.patch @@ -0,0 +1,32 @@ +From 6b27c75125f2b2c66d5d6dd8d35569260ac72f17 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 3 Jan 2025 12:21:28 +0100 +Subject: [PATCH] Don't use non-standard ACCESSPERMS macro + +This macro is non-standard, and is not defined by e.g. musl libc. +It's just a define for 0777, so just use that instead. + +Link: https://github.com/aja-video/libajantv2/pull/42 +--- + ajabase/test/main.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ajabase/test/main.cpp b/ajabase/test/main.cpp +index 78196446..e18b10a3 100644 +--- a/ajabase/test/main.cpp ++++ b/ajabase/test/main.cpp +@@ -1951,9 +1951,9 @@ TEST_SUITE("file" * doctest::description("functions in ajabase/system/file_io.h" + _mkdir(tempDir.c_str()); + _getcwd(cwdBuf, AJA_MAX_PATH); + #else +- if (mkdir(tempDir.c_str(), ACCESSPERMS) == 0) ++ if (mkdir(tempDir.c_str(), 0777) == 0) + { +- chmod(tempDir.c_str(), ACCESSPERMS); ++ chmod(tempDir.c_str(), 0777); + } + char* result = getcwd(cwdBuf, AJA_MAX_PATH); + AJA_UNUSED(result); +-- +2.47.0 + diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index 4b0366d20c52..ef582206401e 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -5,21 +5,26 @@ cmake, ninja, pkg-config, + mbedtls, + udev, + linuxPackages, }: -# Warning: We are aware that the upstream changed and there are new releases, -# this got initally packaged for obs-studio which appears to fail to build even upstream with the new version. -# https://github.com/NixOS/nixpkgs/pull/296191 / https://github.com/obsproject/obs-studio/pull/10037 stdenv.mkDerivation rec { pname = "libajantv2"; - version = "16.2-bugfix5"; + version = "17.1.0"; src = fetchFromGitHub { owner = "aja-video"; - repo = "ntv2"; - rev = "v${version}"; - sha256 = "sha256-h5PKWMwqTeI5/EaTWkjYojuvDU0FyMpzIjWB98UOJwc="; + repo = "libajantv2"; + rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-n9j98r1E9E0hv5gA8jCg/eQyqGuyU9JlZYm/zlcTQOo="; }; + patches = [ + ./use-system-mbedtls.patch + ./device-info-list.patch + ./musl.patch + ]; outputs = [ "out" @@ -31,27 +36,39 @@ stdenv.mkDerivation rec { ninja pkg-config ]; + buildInputs = [ + mbedtls + udev + ]; + + cmakeFlags = [ + (lib.cmakeBool "AJANTV2_BUILD_SHARED" true) + ]; postInstall = '' mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/libajantv2.pc" < (2024-12-20 18:03:16) +Committer: Luke Granger-Brown (2024-12-20 18:03:25) + + Use system mbedtls, rather than downloading from a random Git branch... + +diff --git a/ajantv2/CMakeLists.txt b/ajantv2/CMakeLists.txt +index ffa572e9c8..74c23e8e4e 100644 +--- a/ajantv2/CMakeLists.txt ++++ b/ajantv2/CMakeLists.txt +@@ -52,49 +52,13 @@ + else() + message(STATUS "NTV2 SDK will load signed 3rd-party plugins") + +- set(MBEDTLS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/mbedtls-install) +- set(MBEDTLS_INCLUDE_DIR ${MBEDTLS_INSTALL_DIR}/include) +- set(MBEDTLS_LIBRARY_DIR ${MBEDTLS_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}) +- +- if(CMAKE_SYSTEM_NAME STREQUAL "Windows") +- set(MBEDTLS_LIBRARY ${MBEDTLS_LIBRARY_DIR}/mbedtls.lib) +- set(MBEDX509_LIBRARY ${MBEDTLS_LIBRARY_DIR}/mbedx509.lib) +- set(MBEDCRYPTO_LIBRARY ${MBEDTLS_LIBRARY_DIR}/mbedcrypto.lib) +- set(MBEDTLS_EXTRA_CONFIG_FLAGS +- "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" +- "-DMSVC_STATIC_RUNTIME=ON" +- "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}") +- elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|Darwin)$") +- set(MBEDTLS_LIBRARY ${MBEDTLS_LIBRARY_DIR}/libmbedtls.a) +- set(MBEDX509_LIBRARY ${MBEDTLS_LIBRARY_DIR}/libmbedx509.a) +- set(MBEDCRYPTO_LIBRARY ${MBEDTLS_LIBRARY_DIR}/libmbedcrypto.a) +- set(MBEDTLS_C_FLAGS -fPIC) +- endif() +- +- # BUILD_BYPRODUCTS informing CMake where the .a files are located is required to make Ninja build work +- ExternalProject_Add( +- mbedtls +- GIT_REPOSITORY https://github.com/aja-video/mbedtls.git +- GIT_TAG fix-win-dll-cmake +- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${MBEDTLS_INSTALL_DIR} +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DENABLE_TESTING=OFF +- -DENABLE_PROGRAMS=OFF +- -DCMAKE_C_FLAGS=${MBEDTLS_C_FLAGS} +- -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} +- -DUSE_STATIC_MBEDTLS_LIBRARY=ON +- -DUSE_SHARED_MBEDTLS_LIBRARY=OFF +- ${MBEDTLS_EXTRA_CONFIG_FLAGS} +- BUILD_ALWAYS TRUE +- BUILD_BYPRODUCTS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY} +- ) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(MBEDTLS REQUIRED mbedtls mbedcrypto mbedx509) + + list(APPEND TARGET_INCLUDE_DIRS + ${MBEDTLS_INCLUDE_DIR}) + list(APPEND MBEDTLS_LINK_LIBS +- ${MBEDTLS_LIBRARY} +- ${MBEDCRYPTO_LIBRARY} +- ${MBEDX509_LIBRARY}) ++ ${MBEDTLS_LIBRARIES}) + endif() + + +@@ -668,10 +632,6 @@ + aja_ntv2_log_build_info() + + add_library(${PROJECT_NAME} SHARED ${TARGET_SOURCES}) +- +- if (NOT AJANTV2_DISABLE_PLUGIN_LOAD) +- add_dependencies(${PROJECT_NAME} mbedtls) +- endif() + + target_compile_definitions(${PROJECT_NAME} PUBLIC + ${TARGET_COMPILE_DEFS_DYNAMIC} +@@ -687,10 +647,6 @@ + + add_library(${PROJECT_NAME} STATIC ${TARGET_SOURCES}) + +- if (NOT AJANTV2_DISABLE_PLUGIN_LOAD) +- add_dependencies(${PROJECT_NAME} mbedtls) +- endif() +- + target_compile_definitions(${PROJECT_NAME} PUBLIC + ${TARGET_COMPILE_DEFS_STATIC} + ${AJANTV2_TARGET_COMPILE_DEFS}) diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index db5603ac4aea..4a33fb314bb6 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz , fontconfigSupport ? true, fontconfig ? null # fontconfig support -, rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv , darwin @@ -22,7 +21,6 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature fontconfigSupport "fontconfig") - (lib.enableFeature rasterizerSupport "rasterizer") (lib.enableFeature largeTilesSupport "large-tiles") ]; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 5a20a6651431..a26adf10b65e 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.3.2"; + version = "0.4.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-rW1BG5blozQKA73P5vH5dGkwQG5JJzxdOU2GCB3xIns="; + hash = "sha256-m55SojGt5v5AEatBZiVqQA3xP9eeRWqHa+C3JsTiErQ="; }; outputs = [ diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index 0ff290122945..f648e896d262 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -1,6 +1,8 @@ { stdenv, lib, buildPackages, fetchurl, runtimeShell +, pkgsBuildHost , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic +, withGo ? pkgsBuildHost.go.meta.available # passthru.tests , bind @@ -19,17 +21,23 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.70"; + version = "2.73"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "sha256-I6bviq2vHj6HX2M7stEWz++JUtunvHxWmxNFjhlSsw8="; + hash = "sha256-ZAX2CJz0zdjCcVQM2ZBlTXjdCxmJstm9og+TOnWnlaU="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] ++ lib.optional usePam "pam"; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + nativeBuildInputs = lib.optionals withGo [ + pkgsBuildHost.go + ]; buildInputs = lib.optional usePam pam; @@ -39,6 +47,12 @@ stdenv.mkDerivation rec { "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] ++ lib.optionals withGo [ + "GOLANG=yes" + ''GOCACHE=''${TMPDIR}/go-cache'' + "GOFLAGS=-trimpath" + "GOARCH=${pkgsBuildHost.go.GOARCH}" + "GOOS=${pkgsBuildHost.go.GOOS}" ] ++ lib.optionals isStatic [ "SHARED=no" "LIBCSTATIC=yes" ]; postPatch = '' @@ -54,6 +68,10 @@ stdenv.mkDerivation rec { --replace 'lib_prefix=$(exec_prefix)' "lib_prefix=$lib" \ --replace 'inc_prefix=$(prefix)' "inc_prefix=$dev" \ --replace 'man_prefix=$(prefix)' "man_prefix=$doc" + '' + lib.optionalString withGo '' + # disable cross compilation for artifacts which are run as part of the build + substituteInPlace go/Makefile \ + --replace-fail '$(GO) run' 'GOOS= GOARCH= $(GO) run' ''; installFlags = [ "RAISE_SETFCAP=no" ]; @@ -67,6 +85,12 @@ stdenv.mkDerivation rec { mv "$lib"/lib/security "$pam/lib" ''; + strictDeps = true; + + disallowedReferences = lib.optionals withGo [ + pkgsBuildHost.go + ]; + passthru.tests = { inherit bind diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix index dfd17f890c47..22d497f098dd 100644 --- a/pkgs/by-name/li/libcupsfilters/package.nix +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -7,6 +7,7 @@ fontconfig, ghostscript, lcms2, + lib, libexif, libjpeg, libpng, @@ -33,9 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - cups ]; buildInputs = [ + cups dbus fontconfig ghostscript @@ -50,9 +51,10 @@ stdenv.mkDerivation rec { qpdf ]; configureFlags = [ - "--with-mutool-path=${mupdf}/bin/mutool" - "--with-gs-path=${ghostscript}/bin/gs" - "--with-ippfind-path=${cups}/bin/ippfind" + "--with-cups-config=${lib.getExe' (lib.getDev cups) "cups-config"}" + "--with-mutool-path=${lib.getExe' mupdf "mutool"}" + "--with-gs-path=${lib.getExe ghostscript}" + "--with-ippfind-path=${lib.getExe' cups "ippfind"}" "--enable-imagefilters" "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" ]; @@ -61,4 +63,11 @@ stdenv.mkDerivation rec { "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; + + meta = { + homepage = "https://github.com/OpenPrinting/libcupsfilters"; + description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + }; } diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 529e01227574..85ef67d6ae8a 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.153.0"; + version = "1.154.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-kRyDmbz17zHCDfIvxejEvNZTRRF0bHApa3jT5hs4htM="; + hash = "sha256-knlfcuZw7gPalLc/BSNvKmdweZAfd/QeBRNFX4OkOV8="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-hPfWyJbBFFlh+Cy1ZrzJ9mq1nhEVr+GGTneMkqYfAtk="; + hash = "sha256-Wbuz03gNlnQCu3p9rRdeZTCtIJqFUK71e8CmEOousFI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index bb81836e131a..050f3cd6b488 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.123"; + version = "2.4.124"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-ormFZ6FJp0sPUOkegl+cAxXYbnvpt0OU2uiymMqtt54="; + hash = "sha256-rDYpP2HKSq+vSxaip6//MSqk9cN8n715fenjwIY8o3k="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/by-name/li/liberation-sans-narrow/package.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix index 0fd45c6c500e..7945a5b0a4fd 100644 --- a/pkgs/by-name/li/liberation-sans-narrow/package.nix +++ b/pkgs/by-name/li/liberation-sans-narrow/package.nix @@ -18,15 +18,17 @@ stdenv.mkDerivation rec { sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; }; - buildInputs = [ + nativeBuildInputs = [ fontforge python3Packages.fonttools python3 ]; installPhase = '' + runHook preInstall find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/by-name/li/libfreefare/package.nix similarity index 64% rename from pkgs/development/libraries/libfreefare/default.nix rename to pkgs/by-name/li/libfreefare/package.nix index 3bbfb5f6834f..8aa06f577a95 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/by-name/li/libfreefare/package.nix @@ -6,9 +6,7 @@ pkg-config, libnfc, openssl, - libobjc ? null, - IOKit, - Security, + darwin, }: stdenv.mkDerivation { @@ -17,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2"; - sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; + hash = "sha256-v6MdFKmaEkf17UkZXWNz3lEuPrdb8WJ2WLQM9/h2vGQ="; }; nativeBuildInputs = [ @@ -30,16 +28,21 @@ stdenv.mkDerivation { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security + darwin.libobjc + darwin.apple_sdk ]; - meta = with lib; { + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + ]; + }; + + meta = { description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; - license = licenses.lgpl3; + license = lib.licenses.lgpl3; homepage = "https://github.com/nfc-tools/libfreefare"; - maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix index 2dee6c721bc1..dec30fe9d0d4 100644 --- a/pkgs/by-name/li/libgpg-error/package.nix +++ b/pkgs/by-name/li/libgpg-error/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext +{ stdenv, lib, buildPackages, fetchurl, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -17,21 +17,13 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.50"; + version = "1.51"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-aUBTSeCmM+REooxbNc6PFEhGhFGKUI3EigiZkv6T4go="; + hash = "sha256-vg8bLba5Pu1VNpzfefGfcnUMjHw5/CC1d+ckVFQn5rI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/cc17f22f4056d84967bd94cf41458e3d3150f9e1/devel/libgpg-error/files/patch-src-spawn-posix.c.diff"; - extraPrefix = ""; - hash = "sha256-nIS9oKcgHdHtRTlaSx7mgwQPXq855t+SNujplQKKhzQ="; - }) - ]; - postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure ''; diff --git a/pkgs/by-name/li/libiberty/package.nix b/pkgs/by-name/li/libiberty/package.nix index 2040ef3bee08..fc7584e484df 100644 --- a/pkgs/by-name/li/libiberty/package.nix +++ b/pkgs/by-name/li/libiberty/package.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native + # updateAutotoolsGnuConfigScriptsHook doesn't seem to work here + postPatch = '' + substituteInPlace ../config.guess --replace-fail /usr/bin/uname uname + ''; + configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared"; diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index 4925fc1a9e31..2c9cecbf894c 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -3,40 +3,28 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "c_test" @@ -48,9 +36,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -60,9 +51,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -88,47 +79,29 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "imagequant" -version = "4.3.1" +version = "4.3.3" dependencies = [ "arrayvec", "lodepng", @@ -149,18 +122,17 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "lodepng" -version = "3.10.1" +version = "3.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" +checksum = "7b2dea7cda68e381418c985fd8f32a9c279a21ae8c715f2376adb20c27a0fad3" dependencies = [ "crc32fast", - "fallible_collections", "flate2", "libc", "rgb", @@ -168,36 +140,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "proc-macro2" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "rayon" @@ -221,23 +175,18 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] [[package]] -name = "syn" -version = "2.0.64" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "thread_local" @@ -248,35 +197,3 @@ dependencies = [ "cfg-if", "once_cell", ] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index f4e3512bdb76..d1e3c6e4470c 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-dau+oGwcyN7AA1jEBtCgYV/cmrx5Wo3koKXbloYagrw="; + hash = "sha256-l5YWT0lZ9+RSa347CEjfPX+MPZBQkraKADEBWg4ssNY="; }; cargoLock = { diff --git a/pkgs/by-name/li/libixion/package.nix b/pkgs/by-name/li/libixion/package.nix index 79283f35fa15..d921b8fe8653 100644 --- a/pkgs/by-name/li/libixion/package.nix +++ b/pkgs/by-name/li/libixion/package.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + python3.pythonOnBuildForHost ]; buildInputs = [ diff --git a/pkgs/by-name/li/liblangtag/package.nix b/pkgs/by-name/li/liblangtag/package.nix index 68299e702347..dde975fd05e8 100644 --- a/pkgs/by-name/li/liblangtag/package.nix +++ b/pkgs/by-name/li/liblangtag/package.nix @@ -43,9 +43,13 @@ stdenv.mkDerivation rec { cp "${language_subtag_registry}" data/language-subtag-registry ''; - configureFlags = lib.optional ( - stdenv.hostPlatform.libc == "glibc" - ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; + configureFlags = + [ + "ac_cv_va_copy=1" + ] + ++ lib.optional ( + stdenv.hostPlatform.libc == "glibc" + ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; buildInputs = [ gettext diff --git a/pkgs/by-name/li/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix index 053f0113b444..eaa5943ffe14 100644 --- a/pkgs/by-name/li/libmpc/package.nix +++ b/pkgs/by-name/li/libmpc/package.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl , gmp, mpfr +, updateAutotoolsGnuConfigScriptsHook }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -20,6 +21,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ gmp mpfr ]; + nativeBuildInputs = [ + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native + updateAutotoolsGnuConfigScriptsHook + ]; doCheck = true; # not cross; diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix index da1b8609bf81..e022b534cf8e 100644 --- a/pkgs/by-name/li/libnl/package.nix +++ b/pkgs/by-name/li/libnl/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libnl"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { repo = "libnl"; owner = "thom311"; rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-QwDn7S9lyU+/Pc9daqy1qDZFU03dUQF5PDqFEn03WWc="; + hash = "sha256-GuYV2bUOhLedB/o9Rz6Py/G5HBK2iNefwrlkZJXgbnI="; }; outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py"; diff --git a/pkgs/by-name/li/libossp_uuid/package.nix b/pkgs/by-name/li/libossp_uuid/package.nix index a04339778f05..57078f4741eb 100644 --- a/pkgs/by-name/li/libossp_uuid/package.nix +++ b/pkgs/by-name/li/libossp_uuid/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "ac_cv_va_copy=yes" + "ac_cv_va_copy=C99" ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix index 39383430208c..1493e22d2c22 100644 --- a/pkgs/by-name/li/libppd/package.nix +++ b/pkgs/by-name/li/libppd/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { cups ]; buildInputs = [ + cups ghostscript libcupsfilters mupdf diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 7b63fb45435e..700092119a7e 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -7,7 +7,6 @@ pkg-config, # for passthru.tests - deepin, freeimage, hdrmerge, imagemagick, @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { passthru.tests = { inherit imagemagick hdrmerge freeimage; - inherit (deepin) deepin-image-viewer; inherit (python3.pkgs) rawkit; }; diff --git a/pkgs/by-name/li/libstudxml/package.nix b/pkgs/by-name/li/libstudxml/package.nix index ceaf052eee70..7cba6de407cd 100644 --- a/pkgs/by-name/li/libstudxml/package.nix +++ b/pkgs/by-name/li/libstudxml/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libstudxml"; - version = "1.1.0-b.10+2"; + version = "1.1.0"; src = fetchgit { url = "https://git.codesynthesis.com/libstudxml/libstudxml.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-OsjMhQ3u/wLhOay7qg9sQMEhnAOdrO30dsKQ8aDWUOo="; + hash = "sha256-WMqO03ShZ5h3gqe3VQmdxE6JT4799kfdDbsqHVBzReI="; }; outputs = [ @@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; + strictDeps = true; + nativeBuildInputs = [ build2 ]; # lib files are not marked as executable by default diff --git a/pkgs/by-name/li/libtiff/headers.patch b/pkgs/by-name/li/libtiff/headers.patch deleted file mode 100644 index 933e06f32326..000000000000 --- a/pkgs/by-name/li/libtiff/headers.patch +++ /dev/null @@ -1,16 +0,0 @@ -export private headers for freeimage ---- i/libtiff/Makefile.am -+++ w/libtiff/Makefile.am -@@ -36,8 +36,12 @@ EXTRA_DIST = \ - tif_win32_versioninfo.rc - - libtiffinclude_HEADERS = \ -+ tif_config.h \ -+ tif_dir.h \ -+ tif_hash_set.h \ - tiff.h \ - tiffio.h \ -+ tiffiop.h \ - tiffvers.h - - if HAVE_CXX diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 674369df1cd0..03564fced802 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -5,7 +5,7 @@ fetchpatch, nix-update-script, - autoreconfHook, + cmake, pkg-config, sphinx, @@ -40,11 +40,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # FreeImage needs this patch - ./headers.patch # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch + ./static.patch ]; postPatch = '' @@ -61,16 +60,16 @@ stdenv.mkDerivation (finalAttrs: { ]; postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private + mkdir -p $dev_private/include + mv -t $dev_private/include \ + libtiff/tif_config.h \ + ../libtiff/tif_dir.h \ + ../libtiff/tif_hash_set.h \ + ../libtiff/tiffiop.h ''; - # If you want to change to a different build system, please make - # sure cross-compilation works first! nativeBuildInputs = [ - autoreconfHook + cmake pkg-config sphinx ]; @@ -92,6 +91,10 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; + cmakeFlags = [ + "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" + ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/by-name/li/libtiff/rename-version.patch b/pkgs/by-name/li/libtiff/rename-version.patch index 04fa1bfc88c7..f5c9ec2811ca 100644 --- a/pkgs/by-name/li/libtiff/rename-version.patch +++ b/pkgs/by-name/li/libtiff/rename-version.patch @@ -1,21 +1,13 @@ -fix case-insensitive build ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ docfiles = \ - README.md \ - RELEASE-DATE \ - TODO \ -- VERSION -+ VERSION.txt +diff --git a/cmake/AutotoolsVersion.cmake b/cmake/AutotoolsVersion.cmake +index f93f5cf0..fd33df59 100644 +--- a/cmake/AutotoolsVersion.cmake ++++ b/cmake/AutotoolsVersion.cmake +@@ -41,7 +41,7 @@ set(LIBTIFF_VERSION "${LIBTIFF_MAJOR_VERSION}.${LIBTIFF_MINOR_VERSION}.${LIBTIFF + set(LIBTIFF_VERSION_FULL "${LIBTIFF_VERSION}${LIBTIFF_ALPHA_VERSION}") - EXTRA_DIST = \ - placeholder.h \ -@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") - release: - @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + # Get release version from file VERSION +-FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" LIBTIFF_RELEASE_VERSION) ++FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt" LIBTIFF_RELEASE_VERSION) - pkgconfigdir = $(libdir)/pkgconfig + # Package date - get it from file RELEASE-DATE + FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE-DATE" LIBTIFF_RELEASE_DATE) diff --git a/pkgs/by-name/li/libtiff/static.patch b/pkgs/by-name/li/libtiff/static.patch new file mode 100644 index 000000000000..0eecc5d149b8 --- /dev/null +++ b/pkgs/by-name/li/libtiff/static.patch @@ -0,0 +1,36 @@ +From ed5fcc718075021fe670daee6dd426a5e12d6842 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Thu, 19 Dec 2024 16:51:51 +0100 +Subject: [PATCH] Fix name of Lerc package + +Lerc calls its CMake package "Lerc", not "LERC". This meant that, +even if building libtiff with -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON, +Lerc's CMake files wouldn't be used as intended. + +Link: https://gitlab.com/libtiff/libtiff/-/merge_requests/686 +--- + cmake/{FindLERC.cmake => FindLerc.cmake} | 0 + cmake/LERCCodec.cmake | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename cmake/{FindLERC.cmake => FindLerc.cmake} (100%) + +diff --git a/cmake/FindLERC.cmake b/cmake/FindLerc.cmake +similarity index 100% +rename from cmake/FindLERC.cmake +rename to cmake/FindLerc.cmake +diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake +index 54504ca1..237f8d7e 100644 +--- a/cmake/LERCCodec.cmake ++++ b/cmake/LERCCodec.cmake +@@ -25,7 +25,7 @@ + + # libLerc + set(LERC_SUPPORT FALSE) +-find_package(LERC) ++find_package(Lerc) + option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND}) + if (lerc AND LERC_FOUND AND ZIP_SUPPORT) + set(LERC_SUPPORT TRUE) +-- +2.47.0 + diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index 425c2969da21..fd184de09667 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "0.14.1"; + version = "0.15.0"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - hash = "sha256-IxrLE9xuwCPoNqDwZm9qq0fcYh7LHSzZ2cIvkiZ4q8A="; + hash = "sha256-Ty2DmvZ5Ba05bW1TulZJtmET2QhA3LyJlB4NpkvM04w="; }; outputs = [ diff --git a/pkgs/by-name/li/libvdpau/installdir.patch b/pkgs/by-name/li/libvdpau/installdir.patch deleted file mode 100644 index 859715f70d39..000000000000 --- a/pkgs/by-name/li/libvdpau/installdir.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/trace/meson.build 2020-02-15 16:34:58.698832000 +0100 -+++ b/trace/meson.build 2020-02-15 16:39:05.359952802 +0100 -@@ -4,5 +4,5 @@ - dependencies : libdl, - version : '1.0.0', - install : true, -- install_dir : moduledir, -+ install_dir : get_option('prefix') + '/lib/libvdpau', - ) diff --git a/pkgs/by-name/li/libvdpau/package.nix b/pkgs/by-name/li/libvdpau/package.nix index 75c61995071e..37ced1abc20f 100644 --- a/pkgs/by-name/li/libvdpau/package.nix +++ b/pkgs/by-name/li/libvdpau/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; sha256 = "sha256-pdUKQrjCiP68BxUatkOsjeBqGERpZcckH4m06BCCGRM="; }; - patches = [ ./installdir.patch ]; + patches = [ ./tracing.patch ]; outputs = [ "out" "dev" ]; @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lX11"; + # The tracing library in this package must be conditionally loaded with dlopen(). + # Therefore, we must restore the RPATH entry for the library itself that was removed by the patchelf hook. + postFixup = lib.optionalString stdenv.hostPlatform.isElf '' + patchelf $out/lib/libvdpau.so --add-rpath $out/lib + ''; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/VDPAU/"; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; diff --git a/pkgs/by-name/li/libvdpau/tracing.patch b/pkgs/by-name/li/libvdpau/tracing.patch new file mode 100644 index 000000000000..cc4fdf88e48f --- /dev/null +++ b/pkgs/by-name/li/libvdpau/tracing.patch @@ -0,0 +1,24 @@ +diff --git a/src/vdpau_wrapper.c b/src/vdpau_wrapper.c +index 79dcb94..6249af4 100644 +--- a/src/vdpau_wrapper.c ++++ b/src/vdpau_wrapper.c +@@ -185,8 +185,7 @@ static VdpStatus _vdp_open_driver( + if (vdpau_trace && atoi(vdpau_trace)) { + SetDllHandle * set_dll_handle; + +- _vdp_trace_dll = dlopen(VDPAU_MODULEDIR "/libvdpau_trace.so.1", +- RTLD_NOW | RTLD_GLOBAL); ++ _vdp_trace_dll = dlopen("libvdpau_trace.so.1", RTLD_NOW | RTLD_GLOBAL); + if (!_vdp_trace_dll) { + fprintf(stderr, "Failed to open VDPAU trace library %s\n", dlerror()); + _VDP_ERROR_BREAKPOINT(); +diff --git a/trace/meson.build b/trace/meson.build +index 5381b8b..4af408f 100644 +--- a/trace/meson.build ++++ b/trace/meson.build +@@ -4,5 +4,4 @@ trace = shared_library('vdpau_trace', + dependencies : libdl, + version : '1.0.0', + install : true, +- install_dir : moduledir, + ) diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix index abd1e1bd9afe..c47827091eba 100644 --- a/pkgs/by-name/li/libwebp/package.nix +++ b/pkgs/by-name/li/libwebp/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "webmproject"; repo = "libwebp"; rev = "v${version}"; - hash = "sha256-OR/VzKNn3mnwjf+G+RkEGAaaKrhVlAu1e2oTRwdsPj8="; + hash = "sha256-DMHP7DVWXrTsqU0m9tc783E6dNO0EQoSXZTn5kZOtTg="; }; cmakeFlags = [ diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 932569f8d629..68b3bc24530c 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "live-server"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "lomirus"; repo = "live-server"; rev = "v${version}"; - hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g="; + hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM="; }; - cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w="; + cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index a6c13ffa81f6..17d6aa009cf0 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -12,6 +12,12 @@ let + wasm-bindgen-95 = wasm-bindgen-cli.override { + version = "0.2.95"; + hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss="; + cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4="; + }; + commonDerivationAttrs = rec { pname = "lldap"; version = "0.6.1"; @@ -38,7 +44,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-cli binaryen which rustc rustc.llvmPackages.lld + wasm-pack wasm-bindgen-95 binaryen which rustc rustc.llvmPackages.lld ]; buildPhase = '' diff --git a/pkgs/by-name/lm/lm_sensors/package.nix b/pkgs/by-name/lm/lm_sensors/package.nix index 59cb31477546..6748d60926ac 100644 --- a/pkgs/by-name/lm/lm_sensors/package.nix +++ b/pkgs/by-name/lm/lm_sensors/package.nix @@ -2,34 +2,55 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, bash, bison, flex, which, perl, + rrdtool, sensord ? false, - rrdtool ? null, }: -assert sensord -> rrdtool != null; - -stdenv.mkDerivation rec { - pname = "lm-sensors"; +let version = "3.6.0"; - dashedVersion = lib.replaceStrings [ "." ] [ "-" ] version; + tag = lib.replaceStrings [ "." ] [ "-" ] version; +in + +stdenv.mkDerivation { + pname = "lm-sensors"; + inherit version; src = fetchFromGitHub { owner = "lm-sensors"; repo = "lm-sensors"; - rev = "V${dashedVersion}"; + inherit tag; hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY="; }; + patches = [ + # Fix compile failure on GCC 14 with `sensord` enabled. + # From: https://github.com/lm-sensors/lm-sensors/pull/483 + (fetchpatch { + url = "https://github.com/lm-sensors/lm-sensors/pull/483/commits/7a6170f07d05cc6601b4668f211e9389f2e75286.patch"; + hash = "sha256-Q49quv3eXeMvY3jgZFs/F7Rljbq4YyehIDIlsgmloBQ="; + }) + ]; + + outputs = [ + "bin" + "out" + "dev" + "man" + "doc" + ]; + # Upstream build system have knob to enable and disable building of static # library, shared library is built unconditionally. postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d' - substituteInPlace prog/sensors/Module.mk --replace 'lib/$(LIBSHBASENAME)' "" + substituteInPlace prog/sensors/Module.mk \ + --replace-fail 'lib/$(LIBSHBASENAME)' "" ''; nativeBuildInputs = [ @@ -37,6 +58,7 @@ stdenv.mkDerivation rec { flex which ]; + # bash is required for correctly replacing the shebangs in all tools for cross-compilation. buildInputs = [ bash @@ -45,35 +67,43 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "bin"}/bin" + "SBINDIR=${placeholder "bin"}/bin" + "INCLUDEDIR=${placeholder "dev"}/include" + "MANDIR=${placeholder "man"}/share/man" + # This is a dependency of the library. + "ETCDIR=${placeholder "out"}/etc" + "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] ++ lib.optional sensord "PROG_EXTRA=sensord"; - installFlags = [ - "ETCDIR=${placeholder "out"}/etc" - ]; + enableParallelBuilding = true; # Making regexp to patch-out installing of .so symlinks from Makefile is # complicated, it is easier to remove them post-install. postInstall = '' - mkdir -p $out/share/doc/${pname} - cp -r configs doc/* $out/share/doc/${pname} + mkdir -p $doc/share/doc/lm_sensors + cp -r configs doc/* $doc/share/doc/lm_sensors '' + lib.optionalString stdenv.hostPlatform.isStatic '' rm $out/lib/*.so* ''; - meta = with lib; { + meta = { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; - changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; + changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/${tag}/CHANGES"; description = "Tools for reading hardware sensors"; - license = with licenses; [ + license = with lib.licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = with maintainers; [ pmy ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + pmy + oxalica + ]; + platforms = lib.platforms.linux; mainProgram = "sensors"; }; } diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index e5125f67369b..17a7aa5d6a84 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -44,6 +44,8 @@ ocl-icd, opencl-headers, + with_vulkan ? false, + with_tinydream ? false, # do not compile with cublas ncnn, @@ -65,6 +67,7 @@ let with_openblas with_cublas with_clblas + with_vulkan ]) <= 1; if with_openblas then "openblas" @@ -138,6 +141,7 @@ let openclSupport = false; blasSupport = false; rpcSupport = true; + vulkanSupport = false; }; llama-cpp-grpc = @@ -147,8 +151,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "26a8406ba9198eb6fdd8329fa717555b4f77f05f"; - hash = "sha256-WFkg4ZhL5x55JdeFmAGBFKjWd31XyfGPtQkn+9b7GF4="; + rev = "ba8a1f9c5b675459c55a83e3f97f10df3a66c788"; + hash = "sha256-YunQh1760AcknBFwHc6uMZJ7V4OzEAKiwB9HBH1n4bc="; fetchSubmodules = true; }; postPatch = @@ -185,6 +189,7 @@ let rocmSupport = false; openclSupport = with_clblas; blasSupport = with_openblas; + vulkanSupport = with_vulkan; }; espeak-ng' = espeak-ng.overrideAttrs (self: { @@ -404,8 +409,8 @@ let src = fetchFromGitHub { owner = "leejet"; repo = "stable-diffusion.cpp"; - rev = "4570715727f35e5a07a76796d823824c8f42206c"; - hash = "sha256-1w7OokrQflasvauDEADLDJf2530m5a7WP+X1KgwxCks="; + rev = "dcf91f9e0f2cbf9da472ee2a556751ed4bab2d2a"; + hash = "sha256-NHIjLZNfx9G6olp0VWBthuf7jIQC/qVRw6q9A6H866E="; fetchSubmodules = true; }; installPhase = '' @@ -433,12 +438,12 @@ let stdenv; pname = "local-ai"; - version = "2.24.2"; + version = "2.25.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-nJYeNwx6G3WhrTZYi1yoPzYtofx1H7bTkK0T9ld5wcE="; + hash = "sha256-y0Pj74A2t5DpfI/tCEnV/w2zHLDZzXLJtgFLgng4MFw="; }; prepare-sources = @@ -462,7 +467,7 @@ let self = buildGo123Module.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-QmOoICJ11SY8xXE0g1+1mWRUZ3kQPtCcpM6aZiBkHQ0="; + vendorHash = "sha256-5xWrPsQwmGIA2k8OFR9OH3BeCUvLETygViWEOIRgjB0="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -626,6 +631,7 @@ let inherit with_cublas with_openblas + with_vulkan with_tts with_stablediffusion with_tinydream diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 6973d50e99aa..9a4ce5ee4935 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -1,26 +1,28 @@ { - replaceVars, - runCommand, + replaceVarsWith, lib, runtimeShell, coreutils, getopt, }: -runCommand "lsb_release" - { - meta = with lib; { - description = "Prints certain LSB (Linux Standard Base) and Distribution information"; - mainProgram = "lsb_release"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; - } - '' - install -Dm 555 ${ - replaceVars ./lsb_release.sh { - inherit runtimeShell coreutils getopt; - } - } $out/bin/lsb_release - '' +replaceVarsWith { + name = "lsb_release"; + + src = ./lsb_release.sh; + + dir = "bin"; + isExecutable = true; + + replacements = { + inherit coreutils getopt runtimeShell; + }; + + meta = with lib; { + description = "Prints certain LSB (Linux Standard Base) and Distribution information"; + mainProgram = "lsb_release"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/lu/luit/package.nix b/pkgs/by-name/lu/luit/package.nix new file mode 100644 index 000000000000..8be9df590ad7 --- /dev/null +++ b/pkgs/by-name/lu/luit/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + writeScript, + pkg-config, + fetchurl, + libiconv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "luit"; + version = "20240910"; + + src = fetchurl { + url = "https://invisible-mirror.net/archives/luit/luit-${finalAttrs.version}.tgz"; + hash = "sha256-oV1/y/wlrhRT1hrsI/9roEFF1ue3s7AHHrXP2jo6SdU="; + }; + hardeningDisable = [ + "bindnow" + "relro" + ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libiconv ]; + + passthru.updateScript = writeScript "update-luit" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname luit | sort | tail -n1)" + + update-source-version luit "$version" + ''; + + meta = { + description = "Filter between an arbitrary application and a UTF-8 terminal emulator converting the output and input between the locale's encoding and UTF-8"; + homepage = "https://invisible-island.net/luit/"; + # the website says it is licensed MIT-X11, but there are multiple licenses contained in the tarball + license = with lib.licenses; [ + # some of them are supposed to be MIT-X11, but don't have the X11 specific section in their license + # MIT-X11 without the section is just MIT + mit + x11 + # 2 files are gpl3+ + gpl3Plus + ]; + mainProgram = "luit"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix index d241185c5f00..4736c074e7ed 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lxgw-wenkai-screen"; - version = "1.501"; + version = "1.510"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; - hash = "sha256-em3uh53neN8v1ueiw1rWVtC0bteD7IG3X1g9tkjBRJA="; + hash = "sha256-JAU87Jb3gqS1mXYprWKYt5xnzMVlZR992PNmsqnTF3U="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index adf23d18e9c6..ac3c25155883 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.501"; + version = "1.510"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-7BBg6TGJzTVgBHPyzTYGFjXmidvAzOVCWAU11LylmBI="; + hash = "sha256-RZ+vcFDKMW63oYz4meNvNSIyEdY9I5sKhqOAPKlPP4Q="; }; installPhase = '' diff --git a/pkgs/by-name/m1/m17n_db/package.nix b/pkgs/by-name/m1/m17n_db/package.nix index ef3dd0e02ee6..676c88568eb4 100644 --- a/pkgs/by-name/m1/m17n_db/package.nix +++ b/pkgs/by-name/m1/m17n_db/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "m17n-db"; - version = "1.8.7"; + version = "1.8.9"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; - sha256 = "sha256-4Zuw4nr5+yPFLq8OnIJ7tzv87O7J/qsDjmPUvKibmwg="; + sha256 = "sha256-SBJUo4CqnGbX9Ow6o3Kn4dL+R/w53252BEvUQBfEJKQ="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/ma/matcha-rss-digest/package.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix index 02a0a7513bf7..bdc81f69f977 100644 --- a/pkgs/by-name/ma/matcha-rss-digest/package.nix +++ b/pkgs/by-name/ma/matcha-rss-digest/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "matcha-rss-digest"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "piqoni"; repo = "matcha"; rev = "v${version}"; - hash = "sha256-eexDPewRbAxrMVE7m4WHxeBgRl8xKVdtIpCbYPfp24w="; + hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0="; }; vendorHash = "sha256-CURFy92K4aNF9xC8ik6RDadRAvlw8p3Xc+gWE2un6cc="; diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index 419b635f6832..e7aa414e3e3c 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -11,13 +11,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram-unwrapped"; - version = "5.9.0.1"; + version = "5.10.3.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-QmXwO8Dn+ATWGwN5smxOB2kxmJZETSMbqwFoR0t3luc="; + hash = "sha256-vnsQHvBQLc5ZCeGDW3msAPNHgWB7llgEIraNpdb/Fks="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index c52bbe75e7fc..1ac5f00e81ad 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.7.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-2uf49Rz6x0+Mb9EKjyAIlfdmfZ3qRVFLUgwW02SDE48="; + hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0="; }; - cargoHash = "sha256-SXomWGP7xCheIW2n1QNavq28EVWOpwh9AsCYPPUMm14="; + cargoHash = "sha256-xC0zCDGE0AynMUc5qSkgOYB3JqOWDlc8oz4yi6cGCJs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index 52dee4aa95dd..6188c9e3a044 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.31"; + version = "1.6.34"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-INjTObj7H2x5zuIFWdxv+13+6E255Yn06yFPbSyHPvU="; + sha256 = "sha256-DVOA4uCltPzvHYmjaKEcTwZobGAXwf/3eLO0V48GdOw="; }; configureFlags = [ diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index c55dc369929a..d4bd67c4b494 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -28,13 +28,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-st0dbb+GfF0KEyF+Qn/PIE2462ZrrXy8YcnrulHTI8M="; + hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI="; }; patches = [ diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index b73a3d93af47..e06b45b25df4 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,13 +1,13 @@ { - "version": "3.128.0", + "version": "3.129.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_x86_64", - "hash": "sha256-GP7n7oTuecRwstUOguaOhHx9HiwNoFO0BSWX2/AB6LI=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_x86_64", + "hash": "sha256-kvyofs+kBXVJewdjloV/uwR8TMU3jhUbMF+wl7uyl/0=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_aarch64", - "hash": "sha256-WExPypRI9eDpUXoCNkAeO5rsDHULZbpBWLYQxRdvN7I=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_aarch64", + "hash": "sha256-Lk5s2puKkz4hK0I2aQJzfQ5w66ERUtCK1plO52f2OZQ=" } } } diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index a439b5dcd484..387a7966b871 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, glfw, enableShared ? !stdenv.hostPlatform.isStatic, @@ -19,13 +20,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I="; }; + patches = [ + # clang no longer allows using -Ofast + # see: https://github.com/codam-coding-college/MLX42/issues/147 + (fetchpatch { + name = "replace-ofast-with-o3.patch"; + url = "https://github.com/codam-coding-college/MLX42/commit/ce254c3a19af8176787601a2ac3490100a5c4c61.patch"; + hash = "sha256-urL/WVOXinf7hWR5kH+bAVTcAzldkkWfY0+diSf7jHE="; + }) + ]; + postPatch = '' patchShebangs --build ./tools '' + lib.optionalString enableShared '' substituteInPlace CMakeLists.txt \ - --replace-fail "mlx42 STATIC" "mlx42 SHARED" + --replace-fail "mlx42 STATIC" "mlx42 SHARED" ''; strictDeps = true; diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index fac5c22b0716..d8425acd501a 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.34.3"; + version = "5.34.4"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-Zp2Lld3sEk0URLpSZPZ/3q6OkOU7KSlxn0dQ/F/zumA="; + sha256 = "sha256-72B8+qv9N2fUC5ueMgMvdIvuvE1oaDH2ER4OaPvRtGk="; }; nativeBuildInputs = diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index b0bc9b7bcf05..93839bb44023 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -62,12 +62,12 @@ let in stdenv.mkDerivation rec { - version = "1.24.11"; + version = "1.25.2"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-GRInuWd19nBe99lVEYdRGTK1GSc7NFNaMxSRz32YFj8="; + hash = "sha256-Nsz2peaR4Yis+NtumNCL8F8nu0zjBDLcFfx20ympLU0="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch index d8a420ae0d92..652a4a072bcd 100644 --- a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch +++ b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch @@ -1,10 +1,10 @@ -diff --git a/music_assistant/server/helpers/util.py b/music_assistant/server/helpers/util.py -index 3d342b73..a395fb46 100644 ---- a/music_assistant/server/helpers/util.py -+++ b/music_assistant/server/helpers/util.py -@@ -117,30 +117,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider +diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py +index b6e5f2b4..0edead16 100644 +--- a/music_assistant/helpers/util.py ++++ b/music_assistant/helpers/util.py +@@ -424,29 +424,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider def _get_provider_module(domain: str) -> ProviderModuleType: - return importlib.import_module(f".{domain}", "music_assistant.server.providers") + return importlib.import_module(f".{domain}", "music_assistant.providers") - # ensure module requirements are met - for requirement in requirements: @@ -29,8 +29,7 @@ index 3d342b73..a395fb46 100644 - # try loading the provider again to be safe - # this will fail if something else is wrong (as it should) - return await asyncio.to_thread(_get_provider_module, domain) -- -+ raise RuntimeError(f"Missing dependencies for provider {domain}.") ++ raise RuntimeError(f"Missing dependencies for provider {domain}") + def create_tempfile(): - """Return a (named) temporary file.""" diff --git a/pkgs/by-name/mu/music-assistant/ffmpeg.patch b/pkgs/by-name/mu/music-assistant/ffmpeg.patch index e0356bd4189b..158451304a34 100644 --- a/pkgs/by-name/mu/music-assistant/ffmpeg.patch +++ b/pkgs/by-name/mu/music-assistant/ffmpeg.patch @@ -1,7 +1,7 @@ -diff --git a/music_assistant/server/helpers/audio.py b/music_assistant/server/helpers/audio.py -index 80310604..0a72bcfc 100644 ---- a/music_assistant/server/helpers/audio.py -+++ b/music_assistant/server/helpers/audio.py +diff --git a/music_assistant/helpers/audio.py b/music_assistant/helpers/audio.py +index dad3c5db..d1398d66 100644 +--- a/music_assistant/helpers/audio.py ++++ b/music_assistant/helpers/audio.py @@ -74,7 +74,7 @@ async def crossfade_pcm_parts( await outfile.write(fade_out_part) args = [ @@ -20,7 +20,7 @@ index 80310604..0a72bcfc 100644 args += [ "-acodec", pcm_format.content_type.name.lower(), -@@ -812,7 +812,7 @@ async def get_file_stream( +@@ -734,7 +734,7 @@ async def get_file_stream( async def check_audio_support() -> tuple[bool, bool, str]: """Check if ffmpeg is present (with/without libsoxr support).""" # check for FFmpeg presence @@ -29,7 +29,7 @@ index 80310604..0a72bcfc 100644 ffmpeg_present = returncode == 0 and "FFmpeg" in output.decode() # use globals as in-memory cache -@@ -866,7 +866,7 @@ async def get_silence( +@@ -789,7 +789,7 @@ async def get_silence( return # use ffmpeg for all other encodings args = [ @@ -38,11 +38,11 @@ index 80310604..0a72bcfc 100644 "-hide_banner", "-loglevel", "quiet", -diff --git a/music_assistant/server/helpers/ffmpeg.py b/music_assistant/server/helpers/ffmpeg.py -index 0aaa9dcf..88cd9cdb 100644 ---- a/music_assistant/server/helpers/ffmpeg.py -+++ b/music_assistant/server/helpers/ffmpeg.py -@@ -200,7 +200,7 @@ def get_ffmpeg_args( +diff --git a/music_assistant/helpers/ffmpeg.py b/music_assistant/helpers/ffmpeg.py +index 0405fc27..570f9157 100644 +--- a/music_assistant/helpers/ffmpeg.py ++++ b/music_assistant/helpers/ffmpeg.py +@@ -213,7 +213,7 @@ def get_ffmpeg_args( # noqa: PLR0915 # generic args generic_args = [ @@ -51,11 +51,11 @@ index 0aaa9dcf..88cd9cdb 100644 "-hide_banner", "-loglevel", loglevel, -diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py -index c60ea526..162c4ab7 100644 ---- a/music_assistant/server/helpers/tags.py -+++ b/music_assistant/server/helpers/tags.py -@@ -401,7 +401,7 @@ async def parse_tags(input_file: str, file_size: int | None = None) -> AudioTags +diff --git a/music_assistant/helpers/tags.py b/music_assistant/helpers/tags.py +index 55def74b..7c26e13d 100644 +--- a/music_assistant/helpers/tags.py ++++ b/music_assistant/helpers/tags.py +@@ -387,7 +387,7 @@ async def parse_tags(input_file: str, file_size: int | None = None) -> AudioTags Input_file may be a (local) filename or URL accessible by ffmpeg. """ args = ( @@ -64,7 +64,7 @@ index c60ea526..162c4ab7 100644 "-hide_banner", "-loglevel", "fatal", -@@ -462,7 +462,7 @@ async def get_embedded_image(input_file: str) -> bytes | None: +@@ -448,7 +448,7 @@ async def get_embedded_image(input_file: str) -> bytes | None: Input_file may be a (local) filename or URL accessible by ffmpeg. """ args = ( diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index 5e3645598aa7..6e62e6a5e70a 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.8.13"; + version = "2.9.16"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bbNIYVFASAdeF1c+Nrcb92wMEBhrCMI8NdQvYhGvbLI="; + hash = "sha256-bUtclj8GMq1JdC4tYNETl+l+TNF91y4yTANSpuOOm70="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 2b0af834bf2c..20c46046506d 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -27,14 +27,14 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.3.2"; + version = "2.3.4"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-q71LczFsJAvZaWCQg4Lgzg2XX4XDFvA3x255Re00D9Q="; + hash = "sha256-HV2R5zMTao8akUNZMGRKbU8BIxWmdjKFLsGMqA5cfBs="; }; patches = [ @@ -57,6 +57,17 @@ python.pkgs.buildPythonApplication rec { setuptools ]; + pythonRelaxDeps = [ + "aiohttp" + "colorlog" + "cryptography" + "mashumaro" + "orjson" + "pillow" + "xmltodict" + "zeroconf" + ]; + dependencies = with python.pkgs; [ @@ -84,6 +95,7 @@ python.pkgs.buildPythonApplication rec { mashumaro memory-tempfile music-assistant-frontend + music-assistant-models orjson pillow python-slugify diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index f1428848fbc3..de18e7e5c543 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.3.2"; + version = "2.3.4"; providers = { airplay = ps: [ ]; @@ -103,6 +103,6 @@ ps: with ps; [ yt-dlp ytmusicapi - ]; # missing yt-dlp-youtube-accesstoken + ]; }; } diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index d794719fea3c..1bbb14572e2a 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ jinja2 mashumaro orjson aiofiles packaging ])" -p pyright ruff isort nixfmt-rfc-style +#!nix-shell -I nixpkgs=./. -i python3 -p "music-assistant.python.withPackages (ps: music-assistant.dependencies ++ (with ps; [ jinja2 packaging ]))" -p pyright ruff isort nixfmt-rfc-style import asyncio import json import os.path @@ -17,6 +17,7 @@ from urllib.request import urlopen from jinja2 import Environment from mashumaro.exceptions import MissingField +from music_assistant_models.provider import ProviderManifest # type: ignore from packaging.requirements import Requirement TEMPLATE = """# Do not edit manually, run ./update-providers.py @@ -112,11 +113,10 @@ async def get_provider_manifests(version: str = "master") -> List: basedir = Path(os.path.join(tmp, f"server-{version}")) sys.path.append(str(basedir)) - from music_assistant.common.models.provider import ProviderManifest # type: ignore for fn in basedir.glob("**/manifest.json"): try: - manifests.append(await ProviderManifest.parse(fn)) + manifests.append(await ProviderManifest.parse(str(fn))) except MissingField as ex: print(f"Error parsing {fn}", ex) diff --git a/pkgs/by-name/mv/mvfst/glog-0.7.patch b/pkgs/by-name/mv/mvfst/glog-0.7.patch new file mode 100644 index 000000000000..0f72a615b98e --- /dev/null +++ b/pkgs/by-name/mv/mvfst/glog-0.7.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a878c7c473..c76c989f91 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ + find_package(fmt REQUIRED) + find_package(folly REQUIRED) + find_package(Fizz REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(Threads) + + SET(GFLAG_DEPENDENCIES "") +diff --git a/cmake/QuicTest.cmake b/cmake/QuicTest.cmake +index e7d9f0c0c3..5f4525189c 100644 +--- a/cmake/QuicTest.cmake ++++ b/cmake/QuicTest.cmake +@@ -50,7 +50,7 @@ + target_link_libraries(${QUIC_TEST_TARGET} PUBLIC + "${QUIC_TEST_DEPENDS}" + ${LIBGMOCK_LIBRARIES} +- ${GLOG_LIBRARY} ++ glog::glog + ) + + # Per https://github.com/facebook/mvfst/pull/9, disable some warnings diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index b6df17c6a5a7..0179fa3621e7 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ "bin" @@ -33,9 +33,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-2Iqk6QshM8fVO65uIqrTbex7aj8ELNSzNseYEeNdzCY="; + hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index 1e34e7f9d010..b7e293db44c1 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20240728"; + version = "20250116"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = finalAttrs.version; - hash = "sha256-LA7fdbMP3aKJ1QljoKWizqVg3ys3hd8tGaRsQnIO+Hc="; + hash = "sha256-zRGMqMPkP801nZE/pG/NwsiOvv6dTQBcPtfTJCh1eiQ="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index ff4d4bfa88c6..86a223f5cbef 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -88,14 +88,6 @@ stdenv.mkDerivation rec { (lib.enableFeature enableHttp3 "http3") ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") - [ - "-faligned-allocation" - ] - ); - # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; nativeCheckInputs = lib.optionals (enableTests) [ diff --git a/pkgs/by-name/ni/nixos-build-vms/package.nix b/pkgs/by-name/ni/nixos-build-vms/package.nix index fc8b4f403e94..0de2fe24c7f1 100644 --- a/pkgs/by-name/ni/nixos-build-vms/package.nix +++ b/pkgs/by-name/ni/nixos-build-vms/package.nix @@ -1,13 +1,17 @@ { - substituteAll, + replaceVarsWith, runtimeShell, installShellFiles, }: -substituteAll { +replaceVarsWith { name = "nixos-build-vms"; + src = ./nixos-build-vms.sh; - inherit runtimeShell; - buildVms = ./build-vms.nix; + + replacements = { + inherit runtimeShell; + buildVms = "${./build-vms.nix}"; + }; dir = "bin"; isExecutable = true; diff --git a/pkgs/by-name/ni/nixos-container/nixos-container.pl b/pkgs/by-name/ni/nixos-container/nixos-container.pl index 5e504eca749a..d6375f5db66f 100755 --- a/pkgs/by-name/ni/nixos-container/nixos-container.pl +++ b/pkgs/by-name/ni/nixos-container/nixos-container.pl @@ -9,7 +9,7 @@ use Getopt::Long qw(:config gnu_getopt no_bundling); use Cwd 'abs_path'; use Time::HiRes; -my $nsenter = "@utillinux@/bin/nsenter"; +my $nsenter = "@util-linux@/bin/nsenter"; my $su = "@su@"; my $configurationDirectory = "@configurationDirectory@"; diff --git a/pkgs/by-name/ni/nixos-container/package.nix b/pkgs/by-name/ni/nixos-container/package.nix index e8b2f1dc88e5..eddcb03f7902 100644 --- a/pkgs/by-name/ni/nixos-container/package.nix +++ b/pkgs/by-name/ni/nixos-container/package.nix @@ -1,4 +1,4 @@ -{ substituteAll +{ replaceVarsWith , perl , shadow , util-linux @@ -7,33 +7,35 @@ , nixosTests }: -substituteAll { - name = "nixos-container"; - dir = "bin"; - isExecutable = true; - src = ./nixos-container.pl; +replaceVarsWith { + name = "nixos-container"; + dir = "bin"; + isExecutable = true; + src = ./nixos-container.pl; + + replacements = { perl = perl.withPackages (p: [ p.FileSlurp ]); su = "${shadow.su}/bin/su"; - utillinux = util-linux; - inherit configurationDirectory stateDirectory; + inherit configurationDirectory stateDirectory util-linux; + }; - passthru = { - tests = { - inherit (nixosTests) - containers-imperative - containers-ip - containers-tmpfs - containers-ephemeral - containers-unified-hierarchy - ; - }; + passthru = { + tests = { + inherit (nixosTests) + containers-imperative + containers-ip + containers-tmpfs + containers-ephemeral + containers-unified-hierarchy + ; }; + }; - postInstall = '' - t=$out/share/bash-completion/completions - mkdir -p $t - cp ${./nixos-container-completion.sh} $t/nixos-container - ''; - meta.mainProgram = "nixos-container"; + postInstall = '' + t=$out/share/bash-completion/completions + mkdir -p $t + cp ${./nixos-container-completion.sh} $t/nixos-container + ''; + meta.mainProgram = "nixos-container"; } diff --git a/pkgs/by-name/ni/nixos-enter/nixos-enter.sh b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh index 906c5b0e0b90..c57a7858110a 100755 --- a/pkgs/by-name/ni/nixos-enter/nixos-enter.sh +++ b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh @@ -12,7 +12,7 @@ if [ -z "$NIXOS_ENTER_REEXEC" ]; then if [ "$(id -u)" != 0 ]; then extraFlags="-r" fi - exec unshare --fork --mount --uts --mount-proc --pid $extraFlags -- "$0" "$@" + exec unshare --fork --mount --uts --mount-proc $extraFlags -- "$0" "$@" else mount --make-rprivate / fi diff --git a/pkgs/by-name/ni/nixos-enter/package.nix b/pkgs/by-name/ni/nixos-enter/package.nix index 38fe2de663fd..4839b3a34053 100644 --- a/pkgs/by-name/ni/nixos-enter/package.nix +++ b/pkgs/by-name/ni/nixos-enter/package.nix @@ -1,19 +1,21 @@ { lib, - substituteAll, + replaceVarsWith, runtimeShell, installShellFiles, util-linuxMinimal, }: -substituteAll { +replaceVarsWith { name = "nixos-enter"; src = ./nixos-enter.sh; - inherit runtimeShell; + replacements = { + inherit runtimeShell; - path = lib.makeBinPath [ - util-linuxMinimal - ]; + path = lib.makeBinPath [ + util-linuxMinimal + ]; + }; dir = "bin"; isExecutable = true; diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix index 7ffc2984ef03..babc3b14ad65 100644 --- a/pkgs/by-name/ni/nixos-install/package.nix +++ b/pkgs/by-name/ni/nixos-install/package.nix @@ -1,25 +1,26 @@ { lib, - substituteAll, + replaceVarsWith, runtimeShell, installShellFiles, - nix, jq, nixos-enter, util-linuxMinimal, nixosTests, }: -substituteAll { +replaceVarsWith { name = "nixos-install"; src = ./nixos-install.sh; - inherit runtimeShell nix; + replacements = { + inherit runtimeShell; - path = lib.makeBinPath [ - jq - nixos-enter - util-linuxMinimal - ]; + path = lib.makeBinPath [ + jq + nixos-enter + util-linuxMinimal + ]; + }; dir = "bin"; isExecutable = true; diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix index 199e729221b9..c735d07e3cf3 100644 --- a/pkgs/by-name/oc/octopus/package.nix +++ b/pkgs/by-name/oc/octopus/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM="; }; + patches = [ + # Discover all MPI languages components to avoid scalpack discovery failure + ./scalapack-mpi-alias.patch + ]; + nativeBuildInputs = [ which perl diff --git a/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch b/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch new file mode 100644 index 000000000000..8c8253ebf1f3 --- /dev/null +++ b/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70d89efb5e..47ba750d7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,7 @@ set(Octopus_ext_libs) + find_package(GSL) + if (OCTOPUS_MPI) + set(MPI_DETERMINE_LIBRARY_VERSION ON) +- find_package(MPI 3 COMPONENTS Fortran) ++ find_package(MPI 3) + # Further set MKL variables + if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel) + set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded") diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 63138cca8f45..cb829dd1e7f8 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -10,7 +10,6 @@ common-updater-scripts, git, nix, - nixfmt-classic, jq, coreutils, gnused, @@ -99,7 +98,6 @@ stdenv.mkDerivation rec { curl cacert git - nixfmt-classic nix jq coreutils @@ -111,11 +109,8 @@ stdenv.mkDerivation rec { latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" update-source-version oh-my-zsh "$latestDate" --rev="$latestSha" - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/pkgs/by-name/on/oniguruma/package.nix b/pkgs/by-name/on/oniguruma/package.nix index 33c79220dd2d..4f6e11d6a0ad 100644 --- a/pkgs/by-name/on/oniguruma/package.nix +++ b/pkgs/by-name/on/oniguruma/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.9"; + version = "6.9.10"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; + sha256 = "sha256-Klz8WuJZ5Ol/hraN//wVLNr/6U4gYLdwy4JyONdp/AU="; }; outputs = [ diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix index a36ef44acd28..35b55a0786df 100644 --- a/pkgs/by-name/op/open62541pp/package.nix +++ b/pkgs/by-name/op/open62541pp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open62541pp"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "open62541pp"; repo = "open62541pp"; rev = "v${finalAttrs.version}"; - hash = "sha256-9sxfM1BH6f29JRckNJi+t2TWNvtHmfyc6WO93PR2ofY="; + hash = "sha256-593UaEEqWaheqEBUl13ijuC25sNnuPe9a6gbBo7Zo+E="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/openarena/Makefile.local b/pkgs/by-name/op/openarena/Makefile.local index 2055770f14b2..00e9efa42756 100644 --- a/pkgs/by-name/op/openarena/Makefile.local +++ b/pkgs/by-name/op/openarena/Makefile.local @@ -1,5 +1,5 @@ BUILD_CLIENT=1 -BUILD_RENDERER_OPENGL2=1 +BUILD_RENDERER_OPENGL2=0 BUILD_SERVER=1 USE_CURL_DLOPEN=0 USE_FREETYPE=1 diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix index 90dc1883eb9d..198813d3f6c0 100644 --- a/pkgs/by-name/op/opencl-headers/package.nix +++ b/pkgs/by-name/op/opencl-headers/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencl-headers"; - version = "2024.05.08"; + version = "2024.10.24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-FXDZa5umNilFPls3g/2aNqJvJOJX2JYfY08/Lfm1H1Q="; + sha256 = "sha256-KDlruE0IG8d+lAChxYyc6dg5XOvqCMrMyO69sdAzejA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index 5ce20bf1f99b..da1def67a90f 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.4.5"; + version = "0.4.8"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-67dnZr83QCAy7fWrrbdSV3Yh8ProewZsL6Gv8Bnc3f4="; + hash = "sha256-gsMzquVK4QVXZPHIeAuZW/vHW8tRBWcVAX+/fORDp+U="; }; proxyVendor = true; diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix new file mode 100644 index 000000000000..86c13c0bc70e --- /dev/null +++ b/pkgs/by-name/op/openterface-qt/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + makeDesktopItem, + copyDesktopItems, + fetchFromGitHub, + qt6, + libusb1, +}: +stdenv.mkDerivation (final: { + pname = "openterface-qt"; + version = "0.0.6"; + src = fetchFromGitHub { + owner = "TechxArtisanStudio"; + repo = "Openterface_QT"; + rev = "v${final.version}"; + hash = "sha256-orSOEzyplV0d+faaaRpXeMOhwbnOFxir7DG3LdErCdI="; + }; + nativeBuildInputs = [ + copyDesktopItems + qt6.wrapQtAppsHook + qt6.qmake + ]; + buildInputs = [ + libusb1 + qt6.qtbase + qt6.qtmultimedia + qt6.qtserialport + qt6.qtsvg + ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ./openterfaceQT $out/bin/ + mkdir -p $out/share/pixmaps + cp ./images/icon_256.png $out/share/pixmaps/${final.pname}.png + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "openterfaceQT"; + exec = "openterfaceQT"; + icon = final.pname; + comment = final.meta.description; + desktopName = "Openterface QT"; + categories = [ "Utility" ]; + }) + ]; + + meta = { + description = "Openterface mini-KVM host application for linux"; + homepage = "https://github.com/TechxArtisanStudio/Openterface_QT"; + license = lib.licenses.agpl3Only; + mainProgram = "openterfaceQT"; + maintainers = with lib.maintainers; [ samw ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index f683f27711ca..0a03c5dcad8f 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "opnborg"; - version = "0.1.54"; + version = "0.1.63"; src = fetchFromGitHub { owner = "paepckehh"; repo = "opnborg"; rev = "v${version}"; - hash = "sha256-N6tZqHyL3bOkXJrn4qMVpUR3tQHa8DiurRqy6BJnK+Y="; + hash = "sha256-t/bcqHsRLE4Mxoe/0pziIHHrPf2ijUkYjr1vq8C1ZzQ="; }; - vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc="; + vendorHash = "sha256-kFO4Ju1EbUEc/CZpujmJpM1R1vRI5J4s6UIa2+IhTKE="; ldflags = [ "-s" diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index cf7e21798000..936c090d6b4c 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.68.6"; + version = "2.68.7"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; tag = "v${version}"; - hash = "sha256-7h8U6Ye5Jyf0UmV/+6yHv9QBEtxYHlDBq+T09tmywnM="; + hash = "sha256-x64sHd6d8zpOp9XWhjXkRfBqzyZWRC80QLZ8dYCgGjo="; }; vendorHash = null; @@ -50,7 +50,7 @@ buildGoModule rec { meta = { description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://orbiton.zip"; + homepage = "https://roboticoverlords.org/orbiton/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "o"; diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix index 2782c508692e..6ebb1ac4121f 100644 --- a/pkgs/by-name/ov/ov/package.nix +++ b/pkgs/by-name/ov/ov/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "ov"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; tag = "v${version}"; - hash = "sha256-PZYYr2763L/BOn05TSDr3tkjQQkg2Niic3rJrFSevu0="; + hash = "sha256-xbGo/Hgg5XmJACRa4t4QC2vHse5gJ2D4fmmDKurmfNw="; }; - vendorHash = "sha256-Xntel9WXwCY5iqC9JvrE/iSIXff504fCUP5kYc6pf7Y="; + vendorHash = "sha256-YS4HraVJ++ZLvNRVUynsZsA1lVYo91IuMKmRxCBQeKU="; ldflags = [ "-s" diff --git a/pkgs/by-name/ow/owntracks-recorder/package.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix index d164ac388aa5..7f11113a5a2c 100644 --- a/pkgs/by-name/ow/owntracks-recorder/package.nix +++ b/pkgs/by-name/ow/owntracks-recorder/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace config.mk \ --replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \ + --replace "DOCROOT = /var/spool/owntracks/recorder/htdocs" "DOCROOT = $out/htdocs" \ --replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \ --replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes" @@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { install -m 0755 ot-recorder $out/bin install -m 0755 ocat $out/bin + cp -r docroot $out/htdocs + runHook postInstall ''; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 210de21f32e5..a013bc8f608d 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -45,23 +45,6 @@ let packageOverrides = final: prev: { django = prev.django_5; - # TODO: drop after https://github.com/NixOS/nixpkgs/pull/306556 or similar got merged - django-allauth = prev.django-allauth.overridePythonAttrs ( - { src, nativeCheckInputs, ... }: - let - version = "65.0.2"; - in - { - inherit version; - src = src.override { - tag = version; - hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M="; - }; - - nativeCheckInputs = nativeCheckInputs ++ [ prev.fido2 ]; - } - ); - django-extensions = prev.django-extensions.overridePythonAttrs (_: { # fails with: TypeError: 'class Meta' got invalid attribute(s): index_together # probably because of django_5 but it is the latest version available and used like that in paperless-ngx @@ -232,6 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zxing-cpp ] + ++ django-allauth.optional-dependencies.socialaccount ++ redis.optional-dependencies.hiredis ++ uvicorn.optional-dependencies.standard; diff --git a/pkgs/by-name/pb/pbm/package.nix b/pkgs/by-name/pb/pbm/package.nix index b4d6f1325f9a..52b8f266a6e8 100644 --- a/pkgs/by-name/pb/pbm/package.nix +++ b/pkgs/by-name/pb/pbm/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "pbm"; - version = "1.4.3"; + version = "1.4.4"; - nugetHash = "sha256-R6dmF3HPI2BAcNGLCm6WwBlk4ev6T6jaiJUAWYKf2S4="; + nugetHash = "sha256-2MoIpgBDrjbi2nInGxivgjLSnS/iyv01y0Yia8R/Gyc="; meta = with lib; { description = "CLI for managing Akka.NET applications and Akka.NET Clusters"; diff --git a/pkgs/by-name/pb/pbzip2/package.nix b/pkgs/by-name/pb/pbzip2/package.nix index 3348f0b85ee3..b1c3ca022fe1 100644 --- a/pkgs/by-name/pb/pbzip2/package.nix +++ b/pkgs/by-name/pb/pbzip2/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, bzip2, }: @@ -18,14 +19,30 @@ stdenv.mkDerivation rec { sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; }; + patches = [ + # https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals + # https://bugs.launchpad.net/pbzip2/+bug/2081588 + (fetchpatch { + url = "https://github.com/freebsd/freebsd-ports/raw/974d3ff054965d2bd2ab884a0579ed06c5a08b07/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp"; + extraPrefix = ""; + hash = "sha256-dvXdp+5S41akavy+mvPGHpUxHxenXS7bbTVBVkIJj0s="; + }) + (fetchpatch { + url = "https://github.com/freebsd/freebsd-ports/raw/974d3ff054965d2bd2ab884a0579ed06c5a08b07/archivers/pbzip2/files/patch-BZ2StreamScanner.h"; + extraPrefix = ""; + hash = "sha256-/twP8HyHP4cAVgb5cUPq0CgDxUgDYPdd9haH9wDOrz8="; + }) + ]; + + postPatch = '' + substituteInPlace pbzip2.cpp \ + --replace-fail '"PRIuMAX"' '" PRIuMAX "' + ''; + buildInputs = [ bzip2 ]; - preBuild = "substituteInPlace Makefile --replace g++ c++"; - installFlags = [ "PREFIX=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; - meta = with lib; { homepage = "http://compression.ca/pbzip2/"; description = "Parallel implementation of bzip2 for multi-core machines"; diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index fd0602681c22..aeca44373b14 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -55,6 +55,10 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_BUNDLE=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index a78fafad9275..dcf1fad292eb 100644 --- a/pkgs/by-name/pi/pixman/package.nix +++ b/pkgs/by-name/pi/pixman/package.nix @@ -56,6 +56,11 @@ stdenv.mkDerivation (finalAttrs: { # architectures and requires used to disable them: # https://gitlab.freedesktop.org/pixman/pixman/-/issues/88 mesonAutoFeatures = "auto"; + # fix armv7 build + mesonFlags = lib.optionals stdenv.hostPlatform.isAarch32 [ + "-Darm-simd=disabled" + "-Dneon=disabled" + ]; preConfigure = '' # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 diff --git a/pkgs/by-name/pk/pkgdiff/package.nix b/pkgs/by-name/pk/pkgdiff/package.nix index 68e5143e6ecc..a867c83f5eb1 100644 --- a/pkgs/by-name/pk/pkgdiff/package.nix +++ b/pkgs/by-name/pk/pkgdiff/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.7.2"; + version = "1.8"; pname = "pkgdiff"; src = fetchFromGitHub { owner = "lvc"; repo = "pkgdiff"; rev = version; - sha256 = "1ahknyx0s54frbd3gqh070lkv3j1b344jrs6m6p1s1lgwbd70vnb"; + sha256 = "sha256-/xhORi/ZHC4B2z6UYPOvDzfgov1DcozRjX0K1WYrqXM="; }; buildInputs = [ perl ]; diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index ca29c1de49fe..c819187e4366 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.22.3"; + version = "1.23.1"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-LKcJJXuQEGJ55uPattoSESxE1knlU2XXzdYrQIlX5aA="; + hash = "sha256-W8TlMUAzEeHYrVxJTS3CeBkZzshpuDbFD8lC/ITJMKI="; }; - vendorHash = "sha256-KRjMEH17cvSjtRP/qYeWRFUo6f6v1ZxEd+H3xvZ1udQ="; + vendorHash = "sha256-Oi099KdfSSVDKuWektEucigwchjEHCsOxbCe48DICF8="; ldflags = [ "-s" diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix index cea882e0d8f7..b303d617e2b6 100644 --- a/pkgs/by-name/po/powershell-editor-services/package.nix +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "powershell-editor-services"; - version = "4.1.0"; + version = "4.2.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip"; - hash = "sha256-B6RF4RoJB+C5i6puZhfy6FZzyZ9eMo81dd0XsaIEK6Q="; + hash = "sha256-HSLpgnCx871BuKcerX8NZIN+NbpEz+KQtm1HfUXr7kY="; stripRoot = false; }; diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix index b671e5880c5a..4a1f18db9982 100644 --- a/pkgs/by-name/pp/ppp/package.nix +++ b/pkgs/by-name/pp/ppp/package.nix @@ -1,30 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpcap -, libxcrypt -, pkg-config -, autoreconfHook -, openssl -, bash -, nixosTests +{ + autoreconfHook, + bash, + fetchFromGitHub, + lib, + libpcap, + libxcrypt, + linux-pam, + nixosTests, + openssl, + pkg-config, + stdenv, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, + systemdMinimal, }: stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; pname = "ppp"; src = fetchFromGitHub { owner = "ppp-project"; repo = "ppp"; - rev = "ppp-${version}"; - hash = "sha256-sjaBFP/A63+ycuZm3bxOxAAxMrVHZZFED2Uq8rBapdo="; + tag = "v${version}"; + hash = "sha256-NV8U0F8IhHXn0YuVbfFr992ATQZaXA16bb5hBIwm9Gs="; }; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-openssl=${openssl.dev}" + (lib.enableFeature withSystemd "systemd") ]; nativeBuildInputs = [ @@ -32,12 +37,17 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ - libpcap - libxcrypt - openssl - bash - ]; + buildInputs = + [ + bash + libpcap + libxcrypt + linux-pam + openssl + ] + ++ lib.optionals withSystemd [ + systemdMinimal + ]; postPatch = '' for file in $(find -name Makefile.linux); do @@ -72,16 +82,16 @@ stdenv.mkDerivation rec { inherit (nixosTests) pppd; }; - meta = with lib; { + meta = { homepage = "https://ppp.samba.org"; description = "Point-to-point implementation to provide Internet connections over serial lines"; - license = with licenses; [ + license = with lib.licenses; [ bsdOriginal publicDomain gpl2Only lgpl2 ]; - platforms = platforms.linux; - maintainers = [ ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ stv0g ]; }; } diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 7c06eca325e9..2cb5569135a5 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -103,6 +103,7 @@ python.pkgs.buildPythonApplication rec { "requests" "sentry-sdk" "ua-parser" + "webauthn" ]; pythonRemoveDeps = [ diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index a838ad61677a..fc102e732b51 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -5,12 +5,12 @@ }: let - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-Cy9m9ZwYWXelMsr6n6WWjBw4LlEZxkdy5ZMJKoJ8HZI="; + hash = "sha256-HjVod7h2Q21StSRd2ntYunBFKBmZ4qi+Hl515zI4gbc="; }; in buildGoModule { diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index 29fe74749043..e185a6b74ab4 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.1"; + version = "1.36.3"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-+OFG7dUrxQveG+UmR9gKXxHUJYtVYb/FH1bWxgxwiOw="; + hash = "sha256-yzrdZMWl5MBOAGCXP1VxVZNLCSFUWEURVYiDhRKSSRc="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 9dbfbcb81b18..b4f108966d7a 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-22"; + version = "GE-Proton9-23"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-mPoKv3mvazqiVCLEKS3LXAl2s4EYy7FPoSPexCvMawQ="; + hash = "sha256-eC1vYUfSsESPSaQK6wnOgXMf6fzn+NZ7SU/al5kY6CY="; }; outputs = [ diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/by-name/pr/prowlarr/package.nix similarity index 59% rename from pkgs/servers/prowlarr/default.nix rename to pkgs/by-name/pr/prowlarr/package.nix index 58885ab5da91..2dd8135a8733 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: - +{ + lib, + stdenv, + fetchurl, + mono, + libmediainfo, + sqlite, + curl, + makeWrapper, + icu, + dotnet-runtime, + openssl, + nixosTests, + zlib, +}: let pname = "prowlarr"; @@ -13,21 +26,25 @@ let else unsupported; - arch = { - aarch64-darwin = "arm64"; - aarch64-linux = "arm64"; - x86_64-darwin = "x64"; - x86_64-linux = "x64"; - }.${stdenv.hostPlatform.system} or unsupported; + arch = + { + aarch64-darwin = "arm64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + x86_64-linux = "x64"; + } + .${stdenv.hostPlatform.system} or unsupported; - hash = { - aarch64-darwin = "sha256-N5BDsx9iunG5qUau6gJvdSFscPkNe5/35zMMfsvM+eE="; - aarch64-linux = "sha256-cqSakzwokb4ym8852MYsoyAV3vS9eSyU4/xhHPtsD4o="; - x86_64-darwin = "sha256-2x4k5c1HdNFzDmoEsrrQ3+s41+3wukSMJPHZJJKd/eE="; - x86_64-linux = "sha256-OqZo+kFMTSklwPlj2hr7sAOXCh0HvqbeXWzfmScWXKU="; - }.${stdenv.hostPlatform.system} or unsupported; - -in stdenv.mkDerivation rec { + hash = + { + aarch64-darwin = "sha256-N5BDsx9iunG5qUau6gJvdSFscPkNe5/35zMMfsvM+eE="; + aarch64-linux = "sha256-cqSakzwokb4ym8852MYsoyAV3vS9eSyU4/xhHPtsD4o="; + x86_64-darwin = "sha256-2x4k5c1HdNFzDmoEsrrQ3+s41+3wukSMJPHZJJKd/eE="; + x86_64-linux = "sha256-OqZo+kFMTSklwPlj2hr7sAOXCh0HvqbeXWzfmScWXKU="; + } + .${stdenv.hostPlatform.system} or unsupported; +in +stdenv.mkDerivation rec { inherit pname; version = "1.29.2.4915"; @@ -46,8 +63,17 @@ in stdenv.mkDerivation rec { makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Prowlarr \ --add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo mono openssl icu zlib ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + curl + sqlite + libmediainfo + mono + openssl + icu + zlib + ] + } runHook postInstall ''; diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/by-name/pr/prowlarr/update.sh similarity index 88% rename from pkgs/servers/prowlarr/update.sh rename to pkgs/by-name/pr/prowlarr/update.sh index 883f299d9aa0..17fcde224089 100755 --- a/pkgs/servers/prowlarr/update.sh +++ b/pkgs/by-name/pr/prowlarr/update.sh @@ -19,15 +19,15 @@ updateHash() hash=$(nix-prefetch-url --type sha256 $url) sriHash="$(nix hash to-sri --type sha256 $hash)" - sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix" + sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/package.nix" } updateVersion() { - sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/package.nix" } -currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version) +currentVersion=$(cd $dirname && nix eval --raw -f ../../../.. prowlarr.version) latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 3f05039ba54e..d6685accdf55 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.219.0"; + version = "0.220.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-kiypZpTw2DAF0fB7kqdRgDrvFtenexnVPq3kFNWBEgQ="; + sha256 = "sha256-moCBa0XVOAG+cpLChYCMtvB39/qkWN8JMPBEruRDXzo="; }; - vendorHash = "sha256-/BYWAE2VpHy+HTmHOz4GhstcD+Y6R0tjeF9/8+LiZT0="; + vendorHash = "sha256-yeeB1v7ZnyZVDD3hMEOxCnwJL25qF8IGYVypj1mXGVg="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index f2737b1a28b9..9cd87b629e46 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-12-06"; + version = "0-unstable-2024-12-24"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "d94154e5222aa000f70def82b9711df88b4612d9"; - hash = "sha256-Cdrut2plOpItOdvgdYl7B7f9FqfVRzOmseUs9XAFnfM="; + rev = "f229d7f87051bb6197b315f42adae05cb68e33b5"; + hash = "sha256-6g9XHrBl1rrOnY9CRi0W64/dKOhIJYRr9zXVNgXXex0="; }; dontBuild = true; diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json index dee0ab51a521..56612ad5d0f0 100644 --- a/pkgs/by-name/py/pyright/package-lock.json +++ b/pkgs/by-name/py/pyright/package-lock.json @@ -1,25 +1,28 @@ { "name": "pyright-root", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pyright-root", - "hasInstallScript": true, - "dependencies": { + "devDependencies": { "glob": "^7.2.3", - "jsonc-parser": "^3.2.1" + "jsonc-parser": "^3.3.1" } }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -28,17 +31,24 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -58,6 +68,9 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -66,17 +79,23 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" }, "node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "dev": true, + "license": "MIT" }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -88,6 +107,8 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -96,6 +117,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -103,91 +126,9 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - } - }, - "dependencies": { - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" } } } diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 6a515a4d72ca..6017e0430f90 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,19 @@ -{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, + runCommand, + jq, +}: let - version = "1.1.382"; + version = "1.1.391"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; - rev = "${version}"; - hash = "sha256-/qmDCx1bkqCF/4T3jNz2xiUYwnVYw5IOguRW8DYVQZg="; + tag = version; + hash = "sha256-QtdqMysK1vNqOFv2KQLlTGiCYwb1OWQ1jHITaiKv1hE="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -20,7 +26,8 @@ let pyright-root = buildNpmPackage { pname = "pyright-root"; inherit version src; - npmDepsHash = "sha256-63kUhKrxtJhwGCRBnxBfOFXs2ARCNn+OOGu6+fSJey4="; + sourceRoot = "${src.name}"; # required for update.sh script + npmDepsHash = "sha256-FqEh212Npa2Sye7qeKQJQukNc/nhNVCUp2HoypGGoOA="; dontNpmBuild = true; postPatch = '' cp ${patchedPackageJSON} ./package.json @@ -37,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-zITMHDiZTEbRy/1aqeCrnr9NaO1IUZ1enDw4LXjUjxs="; + npmDepsHash = "sha256-E/zWZnDJd+4HnXYqW1ONoP7Gm+Tmn+8x3y3PIeS3Z3k="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-Ibeg9LgqUhxCgnNryk8ZYu4wNOmVbFHz8ZklNH6msoM="; + npmDepsHash = "sha256-1InoNbKMYNsaAAnlOMutnrwBjM1MroEvR5X9f5id/MA="; postPatch = '' chmod +w ../../ @@ -65,7 +72,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = { - changelog = "https://github.com/Microsoft/pyright/releases/tag/${version}"; + changelog = "https://github.com/Microsoft/pyright/releases/tag/${src.tag}"; description = "Type checker for the Python language"; homepage = "https://github.com/Microsoft/pyright"; license = lib.licenses.mit; diff --git a/pkgs/by-name/py/pyright/update.sh b/pkgs/by-name/py/pyright/update.sh index b0a2b2a11184..a52bdec5480f 100755 --- a/pkgs/by-name/py/pyright/update.sh +++ b/pkgs/by-name/py/pyright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps nodejs set -euo pipefail version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/pyright/releases/latest | jq -r '.tag_name | sub("^v"; "")') @@ -18,11 +18,19 @@ update_hash() { local source_root_path="$1" local existing_hash="$2" - # Formulate download URL - local download_url="${REPO_URL_PREFIX}/${version}${source_root_path}/package-lock.json" - - # Download package-lock.json to temporary directory - curl -fsSL -o "${TEMP_DIR}/package-lock.json" "$download_url" + local package_url="${REPO_URL_PREFIX}/${version}${source_root_path}" + if [ "$source_root_path" == "" ]; then + pushd "${TEMP_DIR}" + curl -fsSL "$package_url/package.json" | jq ' + .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) + | .scripts = { } + ' > package.json + npm install --package-lock + cp package-lock.json "$root/package-lock.json" + popd + else + curl -fsSL -o "${TEMP_DIR}/package-lock.json" "$package_url/package-lock.json" + fi # Calculate the new hash local new_hash diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index e35d29f22629..20ad0459de18 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-12-30 +# Last updated: 2025-01-18 { - version = "3.2.15-2024.12.24"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_arm64_01.deb"; - arm64_hash = "sha256-2+IT7XsK5ziyG9/rihfDhTADwzJ8QDMBz0NyMjZHmzE="; - amd64_hash = "sha256-iBiyFK8sKmWUxntZREwdxWCXSSLB8jxiL4eqo2Qy0is="; + version = "3.2.15-2025.1.10"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_arm64_01.deb"; + arm64_hash = "sha256-F2R5j0x2BnD9/kIsiUe+IbZpAKDOQdjxwOENzzb4RJo="; + amd64_hash = "sha256-hDfaxxXchdZons8Tb5I7bsd7xEjiKpQrJjxyFnz3Y94="; } diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index e107adce1fea..aa0891ab555e 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE="; + hash = "sha256-Z32fOS8Um7x2iFy+2SlmsU8mrDLwboNSI4dm0RligBo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 20f1bcfc31fb..dbc4820558d4 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.3.3"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-KRVByUXiTx5sX7LDgtOlVky8UH5HThaaldvOpeeHd7k="; + hash = "sha256-yAKNqNs1HAYOntHUwdS75rHV9jB2R/6L20uaOPzEooY="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index c45794ea8b6f..22edd7647034 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.20.1"; + version = "3.20.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-a+p8cJKfkux0GupUuoZGfTFrrkW7fzUwmL4W6tr50ek="; + hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw="; }; - cargoHash = "sha256-PKUN0scv7J4znaSAC2lc0AO4LzD4l59kuSKvLGRyXME="; + cargoHash = "sha256-kyjEACPrHWeAbpzi/7Lq+8Fvw/ClBGN6Jn2hebert/g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix index 944e0e4802ea..ac9ee04edd18 100644 --- a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix +++ b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-tmk7H9F+IScYPlcbplcrqUU/+py0DFTO95QYdwz5gIc="; + hash = "sha256-rCA4Rbf7VAcJmRH0KM0gfc3tZPSCBANf7znvoIlD9sk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 25838bba9940..5fb9220ede66 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -9,6 +9,7 @@ desktopToDarwinBundle, libsForQt5, makeDesktopItem, + protobuf, python3Packages, system-config-printer, }: @@ -43,11 +44,16 @@ python3Packages.buildPythonApplication rec { substituteInPlace package_support/gnulinux/50-remarkable.rules \ --replace-fail 'GROUP="yourgroup"' 'GROUP="users"' + + # This must match the protobuf version imported at runtime, regenerate it + rm src/model/update_metadata_pb2.py + protoc --proto_path src/model src/model/update_metadata.proto --python_out=src/model ''; nativeBuildInputs = [ copyDesktopItems + protobuf libsForQt5.wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -66,7 +72,7 @@ python3Packages.buildPythonApplication rec { pdfminer-six pikepdf pillow - protobuf + python3Packages.protobuf # otherwise it picks up protobuf from function args pyside2 ]; diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix index ab86d29838de..7313cf6d939f 100644 --- a/pkgs/by-name/re/re-flex/package.nix +++ b/pkgs/by-name/re/re-flex/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-GL2zg789R8SYB9e3BrMbrXZVg0EDB2LyvL6MO4n4kEk="; + hash = "sha256-QSstDLUYmqTyxu/KyQTVuKkzIdFZ5MsXlHAcTvhTvr8="; }; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index 2b4e3922a55d..02859a9bc813 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "sha256-fw+Dnq5ir5EAz3/GguIVUxe2K5fjQ9eLhpnlCIcw8js="; + sha256 = "sha256-hp9kwsoSRdel1z1+VWREPQdigI1rQ5GrM5/Z6wpnmE0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 5c366be4ab1e..25a017a85bf1 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -18,7 +18,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gHW+5WWzk1H2O5B2sWdl6QcOeUbNvbdZZBD10SmE1GA="; }; - cargoHash = "sha256-Go7+LZSze/IrNwEl+11Dm5O9RcREyPSkHPjlE9SPO70="; + # The `time` crate doesn't build on Rust 1.80+ + # https://github.com/NixOS/nixpkgs/issues/332957 + cargoPatches = [ ./time-crate.patch ]; + + cargoHash = "sha256-RGhcI0TiZWKkzXpiozGLIulQ6YpzWt6lRCPMTTLZDfE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/refinery-cli/time-crate.patch b/pkgs/by-name/re/refinery-cli/time-crate.patch new file mode 100644 index 000000000000..f688dc8d9d33 --- /dev/null +++ b/pkgs/by-name/re/refinery-cli/time-crate.patch @@ -0,0 +1,83 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 59dad7c..eb5b122 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -460,9 +460,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derive_utils" +@@ -1236,6 +1239,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -1414,6 +1423,12 @@ dependencies = [ + "postgres-protocol", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1900,12 +1915,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1913,16 +1930,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" + dependencies = [ ++ "num-conv", + "time-core", + ] diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix index cae8a22373e8..18015a6acf2c 100644 --- a/pkgs/by-name/re/reproxy/package.nix +++ b/pkgs/by-name/re/reproxy/package.nix @@ -32,6 +32,8 @@ buildGoModule rec { mv $out/bin/{app,reproxy} ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple edge server / reverse proxy"; homepage = "https://reproxy.io/"; diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index b65458c525e1..8035a87ce183 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -25,7 +25,7 @@ buildNpmPackage rec { hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc="; }; - npmDepsHash = "sha256-h+48/9h7/cD8woyA0UCLtzKuE9jCrfpDk6IeoDWnYik="; + npmDepsHash = "sha256-C8puCz/w5xkaR4QVXXOdoO8n4gNZrRWMcB9/f1DcuMc="; patches = [ # Adds support for electron versions >=28 @@ -39,6 +39,9 @@ buildNpmPackage rec { (replaceVars ./mk.patch { inherit version; }) + + # would not build with nodejs_22 and above without this + ./update-nan.patch ]; postPatch = '' diff --git a/pkgs/by-name/ri/ride/update-nan.patch b/pkgs/by-name/ri/ride/update-nan.patch new file mode 100644 index 000000000000..64f835915f3e --- /dev/null +++ b/pkgs/by-name/ri/ride/update-nan.patch @@ -0,0 +1,31 @@ +diff --git a/package-lock.json b/package-lock.json +index a0bd285..5a5ec59 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -8034,9 +8034,10 @@ + "dev": true + }, + "node_modules/nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "license": "MIT", + "optional": true + }, + "node_modules/nanomatch": { +@@ -18258,9 +18259,9 @@ + "dev": true + }, + "nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "optional": true + }, + "nanomatch": { diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index 405c41fcb087..c129758de6af 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "robotframework-tidy"; - version = "4.15.0"; + version = "4.16.0"; pyproject = true; src = fetchFromGitHub { owner = "MarketSquare"; repo = "robotframework-tidy"; tag = version; - hash = "sha256-PNf0K1+kjijvJ53UCKkC2LyjBJOroDPdtYjcXbRU1VI="; + hash = "sha256-QTDbxq78p5O5jORyHThUcNx0/VWm0ZRBS8S//Ya9Oig="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/rp/rpmextract/package.nix b/pkgs/by-name/rp/rpmextract/package.nix index 5decce67d5aa..71630ed687c1 100644 --- a/pkgs/by-name/rp/rpmextract/package.nix +++ b/pkgs/by-name/rp/rpmextract/package.nix @@ -3,7 +3,7 @@ stdenv, rpm, cpio, - substituteAll, + replaceVarsWith, }: stdenv.mkDerivation { @@ -13,11 +13,13 @@ stdenv.mkDerivation { install -Dm755 $script $out/bin/rpmextract ''; - script = substituteAll { + script = replaceVarsWith { src = ./rpmextract.sh; isExecutable = true; - inherit rpm cpio; - inherit (stdenv) shell; + replacements = { + inherit rpm cpio; + inherit (stdenv) shell; + }; }; meta = with lib; { diff --git a/pkgs/by-name/rt/rtmpdump/package.nix b/pkgs/by-name/rt/rtmpdump/package.nix index 4ecddd6b68af..3836c3462d26 100644 --- a/pkgs/by-name/rt/rtmpdump/package.nix +++ b/pkgs/by-name/rt/rtmpdump/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchgit -, fetchpatch , zlib , gnutlsSupport ? false , gnutls @@ -14,23 +13,15 @@ assert (gnutlsSupport || opensslSupport); stdenv.mkDerivation { pname = "rtmpdump"; - version = "unstable-2021-02-19"; + version = "2.6"; src = fetchgit { url = "git://git.ffmpeg.org/rtmpdump"; - # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "f1b83c10d8beb43fcc70a6e88cf4325499f25857"; - sha256 = "0vchr0f0d5fi0zaa16jywva5db3x9dyws7clqaq32gwh5drbkvs0"; + # Releases are not tagged. + rev = "6f6bb1353fc84f4cc37138baa99f586750028a01"; + hash = "sha256-rwMA9eougKnkpG+fe6vZIwOBt2CC1d9qI9a079EbE5o="; }; - patches = [ - # Fix build with OpenSSL 1.1 - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b"; - sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1"; - }) - ]; - preBuild = '' makeFlagsArray+=(CC="$CC") ''; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index aa97ab3e2553..1873cc36cf02 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -52,36 +52,14 @@ rustPlatform.buildRustPackage rec { # tests do not appear to respect linker options on doctests # Upstream issue: https://github.com/rust-lang/cargo/issues/14189 # This causes errors like "error: linker `cc` not found" on static builds - postInstallCheck = lib.optionalString (!stdenv.hostPlatform.isStatic) '' - cargoCheckHook - ''; + doCheck = !stdenv.hostPlatform.isStatic; - # Failing on darwin for an unclear reason. + # Failing on darwin for an unclear reason, but probably due to sandbox. # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip=added_package" - "--skip=add_search_path" - "--skip=changed_file" - "--skip=changed_versions_file" - "--skip=deleted_file" - "--skip=directory_deleted" - "--skip=directory_moved_to_trash" - "--skip=directory_moved_to_workspace" - "--skip=directory_renamed" - "--skip=hard_links_in_workspace" - "--skip=hard_links_to_target_outside_workspace" - "--skip=move_file_to_trash" - "--skip=move_file_to_workspace" - "--skip=nested_packages_delete_root" - "--skip=new_file" - "--skip=new_ignored_file" - "--skip=removed_package" - "--skip=rename_file" - "--skip=search_path" - "--skip=unix::changed_metadata" - "--skip=unix::symlinked_module_search_path" - "--skip=unix::symlink_inside_workspace" + cargoTestFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "--workspace" + "--exclude=red_knot" ]; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 656a02a4147e..2f327ea9e768 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.7"; + version = "1.5.10"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-VexgPuuGlBWnlWildlyJd/bVZMS3PNhBnQllsYXYC8I="; + hash = "sha256-oIDWlWE9HE+Zrhei2D56U/dO1VEkbQg3VLrUIopg2oc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index 206d43ed2284..7bf4fa6866df 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, python3, + fetchpatch, fetchPypi, openssl, # Many Salt modules require various Python modules to be installed, @@ -21,6 +22,11 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./fix-libcrypto-loading.patch + (fetchpatch { + name = "urllib.patch"; + url = "https://src.fedoraproject.org/rpms/salt/raw/1c6e7b7a88fb81902f5fcee32e04fa80713b81f8/f/urllib.patch"; + hash = "sha256-yldIurafduOAYpf2X0PcTQyyNjz5KKl/N7J2OTEF/c0="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index b9b38b50fbee..5869d095fb37 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -10,7 +10,6 @@ common-updater-scripts, cacert, git, - nixfmt-classic, nix, jq, coreutils, @@ -66,7 +65,6 @@ stdenv.mkDerivation rec { curl cacert git - nixfmt-classic nix jq coreutils @@ -76,12 +74,9 @@ stdenv.mkDerivation rec { oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" update-source-version ${pname} "$latestSha" --version-key=rev update-source-version ${pname} "$latestDate" --ignore-same-hash - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix index cf5d8a5e4480..3c5485c2318c 100644 --- a/pkgs/by-name/sc/scalapack/package.nix +++ b/pkgs/by-name/sc/scalapack/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, mpiCheckPhaseHook, mpi, @@ -18,14 +19,22 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik="; + tag = "v${version}"; + hash = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik="; }; passthru = { inherit (blas) isILP64; }; __structuredAttrs = true; + patches = [ + (fetchpatch { + name = "version-string"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/76cc1ed3032e9a4158a4513c9047c3746b269f04.patch"; + hash = "sha256-kmllLa9GUeTrHRYeS0yIk9I8LwaIoEytdyQGRuinn3A="; + }) + ]; + # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' @@ -76,6 +85,14 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlags = [ "ARGS=--timeout 10000" ]; + postFixup = '' + # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated + # cmake file will thus look for the library in the dev output instead of out. + # Use the absolute path to $out instead to fix the issue. + substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}" "$out" + ''; + meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; diff --git a/pkgs/by-name/sc/scalpel/package.nix b/pkgs/by-name/sc/scalpel/package.nix index e481d9e22243..7cbdd41caa4f 100644 --- a/pkgs/by-name/sc/scalpel/package.nix +++ b/pkgs/by-name/sc/scalpel/package.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: { autoconf automake libtool + ]; + + buildInputs = [ tre ]; diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 6420ff34f3ed..3f28c4d6ee8a 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.25.0"; + version = "4.27.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; rev = "selenium-${version}"; - hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY="; + hash = "sha256-1i+kPOWTpLYzwhPgUoQXLQ4k+Q1w9KL2VNxvs38SqPc="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-8is7lQ+V1Xf+Aturg836jRMoHIJzDoSVJT5ZOd8W51k="; + cargoHash = "sha256-lD9SFqBO9hhyTD4e7LSBktJzbj7uXk6naHEp9uZPhPc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/service-wrapper/package.nix b/pkgs/by-name/se/service-wrapper/package.nix index 3a6c450449fd..31e272b7edae 100644 --- a/pkgs/by-name/se/service-wrapper/package.nix +++ b/pkgs/by-name/se/service-wrapper/package.nix @@ -2,7 +2,7 @@ lib, stdenv, runCommand, - substituteAll, + replaceVarsWith, coreutils, }: @@ -12,11 +12,13 @@ let in runCommand name { - script = substituteAll { + script = replaceVarsWith { src = ./service-wrapper.sh; isExecutable = true; - inherit (stdenv) shell; - inherit coreutils; + replacements = { + inherit (stdenv) shell; + inherit coreutils; + }; }; meta = with lib; { diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 803376c2b3e7..bc683d7bb9c7 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.16.0"; + version = "4.17.2"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - hash = "sha256-GAwwpyIN5qWSIapjGFfOxPbOx5G6//fEbTpPmkXh6uA="; + hash = "sha256-IoHAr35ziujHTukMbA5QN15YbnpwBT7pUYcqRr+rdog="; }; outputs = [ "out" "su" "dev" "man" ]; @@ -77,10 +77,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups - rm $man/share/man/man1/groups.* - # Move the su binary into the su package mkdir -p $su/bin mv $out/bin/su $su/bin diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 806d816e44c6..6025070694c3 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.11.4"; + version = "3.11.6"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-mcsMp9P9+3ACHkykJitHADoZ35kBeUza2LN+EPnq8RU="; + sha256 = "sha256-599gzxJ53nHVo6MkEICzHxaQl0s1vZRjySSRUxC7ZXA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index 0088cd00b1ba..38ccc847fdf5 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -1,4 +1,5 @@ { + nix-update-script, lib, fetchFromGitHub, rustPlatform, @@ -9,21 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "sirula"; - version = "1.0.0-unstable-2023-09-02"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DorianRudolph"; - repo = pname; - rev = "b15efe85ef1fe50849a33e5919d53d05f4f66090"; - hash = "sha256-S0WbqY49nKaBUMWfgDKZxFLJuk7uFcnTfV8s86V0Zxs="; + repo = "sirula"; + tag = "v${version}"; + hash = "sha256-rBaH2cIIaRoaw8Os60s4MknZywzDuGLagJiAvEYU4m8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "osstrtools-0.2.2" = "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-7trHMGTWtf4IT7efyKIXM7n4x6j7n2V3I7ZXSSwvzys="; nativeBuildInputs = [ pkg-config ]; @@ -32,11 +29,13 @@ rustPlatform.buildRustPackage rec { gtk-layer-shell ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; - license = with licenses; [ gpl3Plus ]; - maintainers = [ ]; - platforms = platforms.linux; + license = [ lib.licenses.gpl3Plus ]; + maintainers = [ lib.maintainers.atagen ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 1410945e6f63..2efbe1244772 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.1"; + version = "1.8.0.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E="; + hash = "sha256-rcB6nCcjUnz2Vo0vuWVZeUz5wlSkvC7dNvfzeJ6fdiU="; }; postPatch = '' diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 0c9777b1ca88..802c8fe5f0d7 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-F7khXbMilbh5b+eKnzcB0fPPWQqUHqAYPWJb83OnUKQ="; + hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index 71b3bcad6d9f..05efd78c7843 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.10"; + version = "4.2.11"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; tag = "v${version}"; - hash = "sha256-F97g5AhyXXYEICb/0RcfVPype8PVfFAKFEX0Xyg1QoI="; + hash = "sha256-9PlqnpUlV5b8g+lctGjVL1Xgf25SS5xqkDaa1bSlxpk="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/sp/spotify-cli-linux/package.nix b/pkgs/by-name/sp/spotify-cli-linux/package.nix index 9697bd5f6577..aa6351aac89d 100644 --- a/pkgs/by-name/sp/spotify-cli-linux/package.nix +++ b/pkgs/by-name/sp/spotify-cli-linux/package.nix @@ -1,12 +1,14 @@ -{ lib, python3Packages, fetchPypi, dbus }: +{ lib, python3Packages, fetchFromGitHub, dbus }: python3Packages.buildPythonApplication rec { pname = "spotify-cli-linux"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-YW9HLcy50d44TRUEEkWAd92Gr2sTpRiu/w/bhF+LdBM="; + src = fetchFromGitHub { + owner = "pwittchen"; + repo = "spotify-cli-linux"; + tag = "v${version}"; + hash = "sha256-Ko/as7wiBHawmyag9jFZqpPUZhb3p1+oYcl+26XyBZk="; }; preBuild = '' diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 8b236d549141..66065fd74588 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -11,18 +11,18 @@ }: rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${version}"; - hash = "sha256-uvgzfMMW/7oiy/SON+Hp4NItiGeKAAM+bMpQ7FPtfqY="; + hash = "sha256-gKYoTdGaonnLEnaoFlniD9nA5+TM5ITjyL/elOM7gZI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oIVtlVkW46UeNw2MCwECQON09fRzTKot3pDgWoC35D0="; + cargoHash = "sha256-z0ZZnXUH834f6FPYhAcmjmtLEYMvbT97UPgn6ddlxdY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index d9819c60973d..4c255f4bab51 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.20.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-M3VUpe8M2O2EXjD9/+YNa7Q7l0Q/WXbIhObyFa/Wg18="; + hash = "sha256-0mFpTE/scvsFbS9VAwXw3tiMHwHgPahzNq7foW4dCUE="; }; - vendorHash = "sha256-eAyex6OqQc/nLWpCbmjyjxPf3pdK9wPAc8eARwiCrIs="; + vendorHash = "sha256-fRJ70BTTRKrFdOOm1DAvXj4frdN0Ak71pCRZMnsjYnY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 71f6b098561f..4a9c31379d0d 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.23"; + version = "2.11.26"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-tlKiRvLTIt0lKc/fOQBj07lFjgOSkKNE4iNlNwxfTCU="; + hash = "sha256-WRbBqgjNn9W9qRFlbuNAOr8L6lzI1DpTsTCgCQiKSnU="; }; sourceRoot = "."; diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix index af4a2bc77b4d..a2625823c40f 100644 --- a/pkgs/by-name/su/summon/package.nix +++ b/pkgs/by-name/su/summon/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "summon"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "cyberark"; repo = "summon"; rev = "v${version}"; - hash = "sha256-Y61lVqsKZiHLJF0X4DIq6U7eRXJ0+6I/dBPwXYb2GmQ="; + hash = "sha256-W0KTZPxPY8sFZD1dB6fSo+YB0EDMD71TsPs98EbgM1Q="; }; vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk="; diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 05a182ac8063..5c92b8ac5848 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg @@ -31,6 +31,18 @@ stdenv.mkDerivation (finalAttrs: { inherit swaybg; }) + # libinput-1.27 support: + # https://github.com/swaywm/sway/pull/8470 + (fetchpatch { + name = "libinput-1.27-p1.patch"; + url = "https://github.com/swaywm/sway/commit/bbadf9b8b10d171a6d5196da7716ea50ee7a6062.patch"; + hash = "sha256-lA+oL1vqGQOm7K+AthzHYBzmOALrDgxzX/5Dx7naq84="; + }) + (fetchpatch { + name = "libinput-1.27-p2.patch"; + url = "https://github.com/swaywm/sway/commit/e2409aa49611bee1e1b99033461bfab0a7550c48.patch"; + hash = "sha256-l598qfq+rpKy3/0arQruwd+BsELx85XDjwIDkb/o6og="; + }) ] ++ lib.optionals (!finalAttrs.isNixOS) [ # References to /nix/store/... will get GC'ed which causes problems when # copying the default configuration: diff --git a/pkgs/by-name/sw/swig/package.nix b/pkgs/by-name/sw/swig/package.nix index 22338889b02c..fe1f55ce5c94 100644 --- a/pkgs/by-name/sw/swig/package.nix +++ b/pkgs/by-name/sw/swig/package.nix @@ -20,12 +20,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hFHEE9wy8Lja9G396tI4fj4LhOkpPKJkDuy1L62AXr4="; }; - PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; + strictDeps = true; nativeBuildInputs = [ autoconf automake libtool bison + pcre2 ]; buildInputs = [ pcre2 ]; diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/.envrc b/pkgs/by-name/sw/switch-to-configuration-ng/.envrc new file mode 100644 index 000000000000..9a9a563f9202 --- /dev/null +++ b/pkgs/by-name/sw/switch-to-configuration-ng/.envrc @@ -0,0 +1 @@ +use nix ../../../.. -A switch-to-configuration-ng diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/README.md b/pkgs/by-name/sw/switch-to-configuration-ng/README.md index 8230b47c9651..c930d8fce97d 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/README.md +++ b/pkgs/by-name/sw/switch-to-configuration-ng/README.md @@ -1,3 +1,12 @@ # switch-to-configuration-ng This program is a reimplementation of [switch-to-configuration](/nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa. + +## Build in a devshell + +``` +cd ./pkgs/by-name/sw/switch-to-configuration-ng +nix-shell ../../../.. -A switch-to-configuration-ng +cd ./src +cargo build +``` diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index e2a4ac7b6296..55b82abe0335 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -26,25 +26,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "swtpm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-IeFrS67qStklaTgM0d3F8Xt8upm2kEawT0ZPFD7JKnk="; + hash = "sha256-ZEpThaLgieTTBJ9Rouklepq6Bvo/h+2sbabNOo++fc0="; }; - patches = [ - # Enable 64-bit file API on 32-bit systems: - # https://github.com/stefanberger/swtpm/pull/941 - (fetchpatch { - name = "64-bit-file-api.patch"; - url = "https://github.com/stefanberger/swtpm/commit/599e2436d4f603ef7c83fad11d76b5546efabefc.patch"; - hash = "sha256-cS/BByOJeNNevQ1B3Ij1kykJwixVwGoikowx7j9gRmA="; - }) - ]; - nativeBuildInputs = [ pkg-config unixtools.netstat diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index 7782f7b38694..36a008ee2af7 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -5,19 +5,15 @@ }: rustPlatform.buildRustPackage rec { pname = "taskchampion-sync-server"; - version = "0.4.1-unstable-2024-08-20"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskchampion-sync-server"; - rev = "af918bdf0dea7f7b6e920680c947fc37b37ffffb"; - fetchSubmodules = false; - hash = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM="; + tag = "v${version}"; + hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo="; }; - cargoHash = "sha256-/HfkE+R8JoNGkCCNQpE/JjGSqPHvjCPnTjOFPCFfJ7A="; - - # cargo tests fail when checkType="release" (default) - checkType = "debug"; + cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4="; meta = { description = "Sync server for Taskwarrior 3"; diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index d83ada41b6ae..8b45d33de589 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -3,18 +3,22 @@ fetchFromGitHub, buildGoModule, installShellFiles, - symlinkJoin, stdenv, }: -let - metaCommon = { - description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; - homepage = "https://docs.temporal.io/cli"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aaronjheng ]; +buildGoModule rec { + pname = "temporal-cli"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; }; + vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; + overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 postBuild = '' @@ -22,110 +26,40 @@ let ''; }; - tctl-next = buildGoModule rec { - pname = "tctl-next"; - version = "1.1.2"; + nativeBuildInputs = [ installShellFiles ]; - src = fetchFromGitHub { - owner = "temporalio"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; - }; - - vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; - - inherit overrideModAttrs; - - nativeBuildInputs = [ installShellFiles ]; - - excludedPackages = [ - "./cmd/docgen" - "./tests" - ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/temporalio/cli/temporalcli.Version=${version}" - ]; - - # Tests fail with x86 on macOS Rosetta 2 - doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - postInstall = '' - installShellCompletion --cmd temporal \ - --bash <($out/bin/temporal completion bash) \ - --fish <($out/bin/temporal completion fish) \ - --zsh <($out/bin/temporal completion zsh) - ''; - - __darwinAllowLocalNetworking = true; - - meta = metaCommon // { - mainProgram = "temporal"; - }; - }; - - tctl = buildGoModule rec { - pname = "tctl"; - version = "1.18.1"; - - src = fetchFromGitHub { - owner = "temporalio"; - repo = "tctl"; - rev = "v${version}"; - hash = "sha256-LX4hyPme+mkNmPvrTHIT5Ow3QM8BTAB7MXSY1fa8tSk="; - }; - - vendorHash = "sha256-294lnUKnXNrN6fJ+98ub7LwsJ9aT+FzWCB3nryfAlCI="; - - inherit overrideModAttrs; - - nativeBuildInputs = [ installShellFiles ]; - - excludedPackages = [ "./cmd/copyright" ]; - - ldflags = [ - "-s" - "-w" - ]; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - postInstall = '' - installShellCompletion --cmd tctl \ - --bash <($out/bin/tctl completion bash) \ - --zsh <($out/bin/tctl completion zsh) - ''; - - __darwinAllowLocalNetworking = true; - - meta = metaCommon // { - mainProgram = "tctl"; - }; - }; -in -symlinkJoin rec { - pname = "temporal-cli"; - inherit (tctl-next) version; - name = "${pname}-${version}"; - - paths = [ - tctl-next - tctl + excludedPackages = [ + "./cmd/docgen" + "./tests" ]; - passthru = { inherit tctl tctl-next; }; + ldflags = [ + "-s" + "-w" + "-X github.com/temporalio/cli/temporalcli.Version=${version}" + ]; - meta = metaCommon // { + # Tests fail with x86 on macOS Rosetta 2 + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); + + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + postInstall = '' + installShellCompletion --cmd temporal \ + --bash <($out/bin/temporal completion bash) \ + --fish <($out/bin/temporal completion fish) \ + --zsh <($out/bin/temporal completion zsh) + ''; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; + homepage = "https://docs.temporal.io/cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "temporal"; - platforms = lib.unique (lib.concatMap (drv: drv.meta.platforms) paths); }; } diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 28159f7f8fa9..0727406f509f 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.8.1"; + version = "3.8.2"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-U+BK3R7LTQjKoTF/R3/fDnFI6qxUYoMfI3SIAJL/spU="; + hash = "sha256-u4ZDOGyO3FkaAyBdSg7aZh3N0glEc7/7m725TpNYnLI="; }; strictDeps = true; diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index 83edbf65cfa5..dea1e31daba6 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tomboy-ng"; - version = "0.41"; + version = "0.42"; src = fetchFromGitHub { owner = "tomboy-notes"; repo = "tomboy-ng"; rev = "v${finalAttrs.version}"; - hash = "sha256-W5pW2QwAFKhs8O5TqUbe2i+uMGDU1G4wZ+f+rfn9+ds="; + hash = "sha256-ppvEZeVHJ4DHIdEXfLOWcb4Wbsi6YVKqm6NGQ7lPtdg="; }; kcontrols = fetchFromGitHub { owner = "davidbannon"; diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix index 4dc321795a2d..ba37d4b3e19e 100644 --- a/pkgs/by-name/tr/trdl-client/package.nix +++ b/pkgs/by-name/tr/trdl-client/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trdl-client"; - version = "0.7.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; rev = "v${version}"; - hash = "sha256-umeoiEq+Cp/cKpiNxCnMDghubm3LPFPJA18ChuYmIVo="; + hash = "sha256-7qhtn64nIcZLThXYLhrs/b5Z6k2mghJ77w6SyVcHmX4="; }; sourceRoot = "${src.name}/client"; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index d6f6b85e4361..62cb6e0abd74 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.63.11"; + version = "2.63.15"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-3Z8LML2BTHAaNEg65YqYg0HyLNG1HwHpztGfSY1VGyw="; + hash = "sha256-4YQCfkAJTTS0n0hDUcc25ks0XtToqNL7eFVM1aPjE/w="; }; postPatch = '' diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 3cac311e475f..177f8e59d3ed 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-ugg6ZrrEAsfgeXBBKrU30orVkcWJV4MgZIVshAv8ys8="; + sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; }; - cargoHash = "sha256-jjkHnxK15WSlhgPpqpU7KNM2KcEi81TrcvIi9gq4YHU="; + cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tu/turses/package.nix b/pkgs/by-name/tu/turses/package.nix index 43008d436c92..bd8a3bb27806 100644 --- a/pkgs/by-name/tu/turses/package.nix +++ b/pkgs/by-name/tu/turses/package.nix @@ -19,10 +19,10 @@ let src = fetchFromGitHub { owner = "tweepy"; repo = "tweepy"; - rev = "v${version}"; - sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw"; + tag = "v${version}"; + hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w="; }; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + dependencies = oldAttrs.dependencies ++ [ super.six super.requests.optional-dependencies.socks ]; @@ -36,13 +36,29 @@ with py.pkgs; buildPythonPackage rec { pname = "turses"; version = "0.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; + hash = "sha256-RqYVQdGs0TOFYaGYswEQgbkfEYQVwIsRFETNskaFs5Y="; }; - propagatedBuildInputs = with py.pkgs; [ + pythonRelaxDeps = [ + "urwid" + "future" + "tweepy" + ]; + + postPatch = '' + substituteInPlace tests/test_config.py \ + --replace-fail "config.generate_config_file.assert_called_once()" "assert config.generate_config_file.call_count == 1" + substituteInPlace tests/test_meta.py \ + --replace-fail "self.observer.update.assert_called_once()" "assert self.observer.update.call_count == 1" + ''; + + build-system = with py.pkgs; [ setuptools ]; + + dependencies = with py.pkgs; [ urwid tweepy future @@ -69,17 +85,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "urwid==1.3.0" "urwid" \ - --replace "future==0.14.3" "future" \ - --replace "tweepy==3.3.0" "tweepy" - substituteInPlace tests/test_config.py \ - --replace "config.generate_config_file.assert_called_once()" "assert config.generate_config_file.call_count == 1" - substituteInPlace tests/test_meta.py \ - --replace "self.observer.update.assert_called_once()" "assert self.observer.update.call_count == 1" - ''; - checkPhase = '' TMP_TURSES=`echo turses-$RANDOM` mkdir $TMP_TURSES @@ -89,10 +94,11 @@ buildPythonPackage rec { meta = with lib; { description = "Twitter client for the console"; - mainProgram = "turses"; homepage = "https://github.com/louipc/turses"; + changelog = "https://github.com/louipc/turses/blob/v${version}/HISTORY.rst"; license = licenses.gpl3Only; maintainers = [ ]; + mainProgram = "turses"; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index ffcb59febd87..99086e0f2788 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.18.4"; + version = "0.19.0"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-EVMG8Xvnj4yZ4gZS4t7M3UjfOHNr8A609D/vw4CaMZw="; + hash = "sha256-MF7J+i1s4yVugWHx7rwsF4ahNTbWfzHnYODgpNoNQlQ="; }; patches = [ diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/no-umu-version-json.patch b/pkgs/by-name/um/umu-launcher-unwrapped/no-umu-version-json.patch new file mode 100644 index 000000000000..dd4e5af1c278 --- /dev/null +++ b/pkgs/by-name/um/umu-launcher-unwrapped/no-umu-version-json.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index b82053d..37db8c9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -50,7 +50,7 @@ fix_shebangs: + umu/umu_version.json: umu/umu_version.json.in + $(info :: Updating $(@) ) + cp $(<) $(<).tmp +- sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp ++ sed 's|##UMU_VERSION##|@version@|g' -i $(<).tmp + mv $(<).tmp $(@) + + .PHONY: version diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix new file mode 100644 index 000000000000..8d37b284ddcb --- /dev/null +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -0,0 +1,70 @@ +{ + python3Packages, + fetchFromGitHub, + lib, + bash, + hatch, + scdoc, + replaceVars, + fetchpatch2, +}: +python3Packages.buildPythonPackage rec { + pname = "umu-launcher-unwrapped"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "Open-Wine-Components"; + repo = "umu-launcher"; + tag = version; + hash = "sha256-TOsVK6o2V8D7CLzVOkLs8AClrZmlVQTfeii32ZIQCu4="; + }; + + # Both patches can be safely removed with the next release + patches = [ + # Patch to avoid running `git describe` + # Fixed by https://github.com/Open-Wine-Components/umu-launcher/pull/289 upstream + (replaceVars ./no-umu-version-json.patch { inherit version; }) + # Patch to use PREFIX in the installer call + (fetchpatch2 { + url = "https://github.com/Open-Wine-Components/umu-launcher/commit/602a2f84a05a63f7b1b1c4d8ca85d99fdaec2cd2.diff"; + hash = "sha256-BMinTXr926V3HlzHHabxHKvy8quEvxsZKu1hoTGQT00="; + }) + ]; + + nativeBuildInputs = [ + python3Packages.build + hatch + scdoc + python3Packages.installer + ]; + + pythonPath = [ + python3Packages.filelock + python3Packages.xlib + ]; + + pyproject = false; + configureScript = "./configure.sh"; + + makeFlags = [ + "PYTHONDIR=$(PREFIX)/${python3Packages.python.sitePackages}" + "PYTHON_INTERPRETER=${lib.getExe python3Packages.python}" + # Override RELEASEDIR to avoid running `git describe` + "RELEASEDIR=${pname}-${version}" + "SHELL_INTERPRETER=${lib.getExe bash}" + ]; + + meta = { + description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools"; + changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}"; + homepage = "https://github.com/Open-Wine-Components/umu-launcher"; + license = lib.licenses.gpl3; + mainProgram = "umu-run"; + maintainers = with lib.maintainers; [ + diniamo + MattSturgeon + fuzen + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/um/umu-launcher/package.nix b/pkgs/by-name/um/umu-launcher/package.nix new file mode 100644 index 000000000000..46de6e41b61b --- /dev/null +++ b/pkgs/by-name/um/umu-launcher/package.nix @@ -0,0 +1,19 @@ +{ + buildFHSEnv, + lib, + umu-launcher-unwrapped, +}: +buildFHSEnv { + pname = "umu-launcher"; + inherit (umu-launcher-unwrapped) version meta; + + targetPkgs = pkgs: [ pkgs.umu-launcher-unwrapped ]; + + executableName = umu-launcher-unwrapped.meta.mainProgram; + runScript = lib.getExe umu-launcher-unwrapped; + + extraInstallCommands = '' + ln -s ${umu-launcher-unwrapped}/lib $out/lib + ln -s ${umu-launcher-unwrapped}/share $out/share + ''; +} diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix index 77bd7158fa0f..d8b32b16118b 100644 --- a/pkgs/by-name/un/unit/package.nix +++ b/pkgs/by-name/un/unit/package.nix @@ -40,14 +40,14 @@ let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { - version = "1.34.0"; + version = "1.34.1"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-M1Fe/jS+u2cXMjIyCbvrBX37LM6Q3xPib9Uywxp7QCI="; + sha256 = "sha256-p3n0j/sZr+aLwfZuXTbb5+J4T48FWdsZBbSH3Yiex9g="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index bc86e8166077..2499fcbb07ba 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.28"; + version = "0.0.29"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; tag = version; - hash = "sha256-Gwks+xTkwK5dgV9AkSthIrhBNwq/WvM9SNr0wR/SBSM="; + hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "uutils-coreutils-${version}"; - hash = "sha256-i7RvsgtmkH8og8lkRQURWLrzrhPkxans+KME2Ili0wM="; + hash = "sha256-BSRYL9qsa+FUjfXTP/vx7VZwOyjhBM7DREvI6/X2tCA="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; + changelog = "https://github.com/uutils/coreutils/releases/tag/${version}"; maintainers = with lib.maintainers; [ siraben ]; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index 4865f6f9d322..f4ddd73c10a7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "velero"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - hash = "sha256-ypNpIEj6hw77cjXkYJ9zsKY0bFP7Nwa2skd1wdONsJY="; + hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE="; }; ldflags = [ diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 4bed65e02238..5cf07681d79b 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -3,26 +3,32 @@ fetchFromGitHub, flutter327, webkitgtk_4_1, - pkg-config, copyDesktopItems, makeDesktopItem, + runCommand, + venera, + yq, + _experimental-update-script-combinators, + gitUpdater, }: + flutter327.buildFlutterApplication rec { pname = "venera"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-zjlu+rdS+ctp8R1laeT9OF+HCLvTyQsAJIBA1fEiNMg="; + hash = "sha256-RqrddFzd0+TePVupqVwTjlt/Jpwi++J3JCsltW6KORo="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { desktop_webview_window = "sha256-15tw3gLN9e886QjBFuYP34KLD1lN8AmQYXVza5Bvs40="; - flutter_qjs = "sha256-SvOgcZquwZ1/HWVkPVnD8Eo+jD3jjfkKsVleJpNaiV0="; + flutter_qjs = "sha256-nbXKfiCvG6JT570RNVq3gec+JFw3H7XG4g/QSNkDw18="; + flutter_7zip = "sha256-KHDq4XG3l+dq1NPW84wOK5kKbXJ8qCK8voGeTnX/Krw="; lodepng_flutter = "sha256-bGc9uXD1EQ/19OIZmR7a/YL9w93fNWdQF5S19LSwxZw="; photo_view = "sha256-Z+9xgvk8YS+bgCbBW7BBY72tV6JUq2kCX5OwKFK4YPE="; scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA="; @@ -32,7 +38,6 @@ flutter327.buildFlutterApplication rec { nativeBuildInputs = [ copyDesktopItems - pkg-config ]; buildInputs = [ @@ -57,15 +62,29 @@ flutter327.buildFlutterApplication rec { }) ]; - extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : $out/app/venera/lib - ''; - postInstall = '' install -Dm0644 ./debian/gui/venera.png $out/share/pixmaps/venera.png ''; - passthru.updateScript = ./update.sh; + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : $out/app/venera/lib + ''; + + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + buildInputs = [ yq ]; + inherit (venera) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "venera.pubspecSource" ./pubspec.lock.json) + ]; + }; meta = { description = "Comic reader that support reading local and network comics"; diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index c13e95a43078..4915cf9bf619 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -377,6 +377,17 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_7zip": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "b33344797f1d2469339e0e1b75f5f954f1da224c", + "resolved-ref": "b33344797f1d2469339e0e1b75f5f954f1da224c", + "url": "https://github.com/wgh136/flutter_7zip" + }, + "source": "git", + "version": "0.0.1" + }, "flutter_file_dialog": { "dependency": "direct main", "description": { @@ -507,8 +518,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f", - "resolved-ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f", + "ref": "9c99ac258a11f8e91761a5466a190efba3ca64af", + "resolved-ref": "9c99ac258a11f8e91761a5466a190efba3ca64af", "url": "https://github.com/wgh136/flutter_qjs" }, "source": "git", @@ -1080,15 +1091,15 @@ "source": "hosted", "version": "5.0.2" }, - "shimmer": { + "shimmer_animation": { "dependency": "direct main", "description": { - "name": "shimmer", - "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9", + "name": "shimmer_animation", + "sha256": "9357080b7dd892aae837d569e1fbbcbe7f9a02ca994e558561d90e35e92f1101", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "2.2.2" }, "sky_engine": { "dependency": "transitive", @@ -1176,6 +1187,16 @@ "source": "hosted", "version": "1.3.0" }, + "syntax_highlight": { + "dependency": "direct main", + "description": { + "name": "syntax_highlight", + "sha256": "ee33b6aa82cc722bb9b40152a792181dee222353b486c0255fde666a3e3a4997", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "term_glyph": { "dependency": "transitive", "description": { @@ -1196,6 +1217,16 @@ "source": "hosted", "version": "0.7.3" }, + "text_scroll": { + "dependency": "direct main", + "description": { + "name": "text_scroll", + "sha256": "7869d86a6fdd725dee56bdd150216a99f0372b82fbfcac319214dbd5f36e1908", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "typed_data": { "dependency": "transitive", "description": { @@ -1401,11 +1432,11 @@ "dependency": "direct main", "description": { "name": "zip_flutter", - "sha256": "955b53d58709fcd9feefbed3d41b5522bc5273e677603e9fc67017a81e568d24", + "sha256": "be21152c35fcb6d0ef4ce89fc3aed681f7adc0db5490ca3eb5893f23fd20e646", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.5" + "version": "0.0.6" } }, "sdks": { diff --git a/pkgs/by-name/ve/venera/update.sh b/pkgs/by-name/ve/venera/update.sh deleted file mode 100755 index 7d9761ca3a5d..000000000000 --- a/pkgs/by-name/ve/venera/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update - -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" - -latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/venera-app/venera/releases/latest | jq --raw-output .tag_name) -latestVersion=$(echo "$latestTag" | sed 's/^v//') - -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; venera.version or (lib.getVersion venera)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "package is up-to-date: $currentVersion" - exit 0 -fi - -nix-update venera - -curl https://raw.githubusercontent.com/venera-app/venera/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix index d698760dbf22..387b8d43d221 100644 --- a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix +++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix @@ -7,6 +7,7 @@ meson, ninja, pkg-config, + unstableGitUpdater, vulkan-headers, vulkan-loader, wayland-scanner, @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { pname = "vulkan-hdr-layer-kwin6"; - version = "0-unstable-2024-10-19"; + version = "0-unstable-2024-12-27"; depsBuildBuild = [ pkg-config ]; @@ -39,11 +40,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Zamundaaa"; repo = "VK_hdr_layer"; - rev = "e173f2617262664901039e3c821929afce05d2c1"; - hash = "sha256-hBxRwbn29zFeHcRpfMF6I4piSASpN2AvZY0ci5Utj4U="; + rev = "1534ef826bfecf525a6c3154f2e3b52d640a79cf"; + hash = "sha256-LaI7axY+O6MQ/7xdGlTO3ljydFAvqqdZpUI7A+B2Ilo="; fetchSubmodules = true; }; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)"; homepage = "https://github.com/Zamundaaa/VK_hdr_layer"; diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 0b94d331b40f..96ad2fa8407e 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath -, testers }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + libX11, + libxcb, + libXrandr, + wayland, + moltenvk, + vulkan-headers, + addDriverRunpath, + enableX11 ? stdenv.hostPlatform.isLinux, + testers, +}: stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; @@ -13,7 +27,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM="; }; - patches = [ ./fix-pkgconfig.patch ] + patches = + [ ./fix-pkgconfig.patch ] ++ lib.optionals stdenv.hostPlatform.is32bit [ # Backport patch to support 64-bit inodes on 32-bit systems # FIXME: remove in next update @@ -23,16 +38,35 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ vulkan-headers ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libXrandr wayland ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = + [ vulkan-headers ] + ++ lib.optionals enableX11 [ + libX11 + libxcb + libXrandr + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + ]; - cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + cmakeFlags = + [ + "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" + (lib.cmakeBool "BUILD_WSI_XCB_SUPPORT" enableX11) + (lib.cmakeBool "BUILD_WSI_XLIB_SUPPORT" enableX11) + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share" ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; doInstallCheck = true; @@ -51,9 +85,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "LunarG Vulkan loader"; - homepage = "https://www.lunarg.com"; - platforms = platforms.unix ++ platforms.windows; - license = licenses.asl20; + homepage = "https://www.lunarg.com"; + platforms = platforms.unix ++ platforms.windows; + license = licenses.asl20; maintainers = [ maintainers.ralith ]; broken = finalAttrs.version != vulkan-headers.version; pkgConfigModules = [ "vulkan" ]; diff --git a/pkgs/by-name/wa/wangle/glog-0.7.patch b/pkgs/by-name/wa/wangle/glog-0.7.patch new file mode 100644 index 000000000000..c80c13d8f78f --- /dev/null +++ b/pkgs/by-name/wa/wangle/glog-0.7.patch @@ -0,0 +1,30 @@ +diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt +index 041e73c2b1..2804ad72cf 100644 +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -66,7 +66,7 @@ + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(gflags CONFIG QUIET) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") +@@ -162,7 +162,6 @@ + ${FOLLY_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${LIBEVENT_INCLUDE_DIR} + ${DOUBLE_CONVERSION_INCLUDE_DIR} +@@ -172,7 +171,7 @@ + ${FIZZ_LIBRARIES} + ${Boost_LIBRARIES} + ${OPENSSL_LIBRARIES} +- ${GLOG_LIBRARIES} ++ glog::glog + ${GFLAGS_LIBRARIES} + ${LIBEVENT_LIB} + ${DOUBLE_CONVERSION_LIBRARY} diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index d5d83869bfab..5d1a723a1b82 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -34,9 +34,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-4mqE9GgJP2f7QAykwdhMFoReE9wmPKOXqSHJ2MHP2G0="; + hash = "sha256-H10BwlKypOuxqrV8BpeJd7gWUqYrCaoW0HwV4I7nxu0="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/wa/warp/package.nix b/pkgs/by-name/wa/warp/package.nix index 785bc4408504..b82f974738e6 100644 --- a/pkgs/by-name/wa/warp/package.nix +++ b/pkgs/by-name/wa/warp/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "warp"; rev = "v${version}"; - hash = "sha256-BUCkENpL1soiYrM1vPNQAZGUbRj1KxWbbgXR0575zGU="; + hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-afRGCd30qJMqQeEOLDBRdVNJLMfa8/F9BO4Ib/OTtvI="; + hash = "sha256-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 09cd62514f5a..8e5f4543a1fc 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "atty" @@ -51,7 +51,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi", ] @@ -97,9 +97,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -110,6 +110,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "clap" version = "2.34.0" @@ -146,18 +152,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -174,18 +180,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "duct" @@ -267,7 +273,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.95", ] [[package]] @@ -336,17 +342,11 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jwalk" @@ -366,9 +366,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "lock_api" @@ -400,29 +400,28 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -430,16 +429,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "autocfg", - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", "memoffset", - "pin-utils", ] [[package]] @@ -453,9 +451,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -501,9 +499,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -537,18 +535,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -575,9 +573,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] @@ -602,9 +600,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -632,20 +630,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.95", ] [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -689,9 +687,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -740,9 +738,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -799,14 +797,14 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.95", ] [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -829,7 +827,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.95", ] [[package]] @@ -850,9 +848,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-core", @@ -860,18 +858,18 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" @@ -1077,5 +1075,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.95", ] diff --git a/pkgs/by-name/wa/watchman/glog-0.7.patch b/pkgs/by-name/wa/watchman/glog-0.7.patch new file mode 100644 index 000000000000..30eaa67b424e --- /dev/null +++ b/pkgs/by-name/wa/watchman/glog-0.7.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd6eec3320..ee74ab0008 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -333,7 +333,7 @@ + find_package(Gflags REQUIRED) + include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR}) + +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + add_compile_definitions(GLOG_NO_ABBREVIATED_SEVERITIES) + + # We indirectly depend on boost. This logic needs to match +@@ -479,7 +479,6 @@ + ) + target_include_directories(third_party_deps INTERFACE + ${FOLLY_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIR} + ${GFLAGS_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index b4a1902f0310..50d155809a40 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -36,15 +36,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2024.11.18.00"; + version = "2025.01.06.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-deOSeExhwn8wrtP2Y0BDaHdmaeiUaDBok6W7N1rH/24="; + hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 0ed176805199..61eedc92e513 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -6,39 +6,34 @@ ninja, pkg-config, scdoc, - mesa, + libgbm, lz4, zstd, ffmpeg, - libva, cargo, rustc, - git, vulkan-headers, vulkan-loader, shaderc, - vulkan-tools, llvmPackages, autoPatchelfHook, - wayland, wayland-scanner, rust-bindgen, - egl-wayland, }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-OV0FHieHce83W2O379VpGmUMrtID7NdtIrxIe+IJfF0="; + hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-pC1m1P4wJOT3jARGlpc86u7GdyPXX+YHsFLOcWRqdxI="; + hash = "sha256-DjqyKXbCQ6kzb1138wNWPnRXIgUaaE1nnCExLeLX6pw="; }; strictDeps = true; @@ -55,11 +50,12 @@ llvmPackages.stdenv.mkDerivation rec { rustc wayland-scanner rustPlatform.cargoSetupHook + autoPatchelfHook rust-bindgen ]; buildInputs = [ - mesa + libgbm lz4 zstd ffmpeg @@ -67,6 +63,12 @@ llvmPackages.stdenv.mkDerivation rec { vulkan-loader ]; + runtimeDependencies = [ + libgbm + ffmpeg.lib + vulkan-loader + ]; + meta = with lib; { description = "Network proxy for Wayland clients (applications)"; longDescription = '' diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 579996b1be68..c1c4410e5263 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "weasis"; - version = "4.4.0"; + version = "4.5.1"; # Their build instructions indicate to use the packaging script src = fetchzip { url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip"; - hash = "sha256-+Bi9rTuM9osKzbKVA4exqsFm8p9+1OHgJqRSNnCC6QQ="; + hash = "sha256-aGoTSOZ1W8JHQ0+FcJ9RZ47A1LfXJOoGNmVDiUd9zxE="; stripRoot = false; }; diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix index 710e621eaa9e..01904b76048e 100644 --- a/pkgs/by-name/wo/worker/package.nix +++ b/pkgs/by-name/wo/worker/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "worker"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz"; - hash = "sha256-Tff/1I9RZYo2oXGsnrGeSs69W9nPu7OFDwF1Bg6R01s="; + hash = "sha256-PXBPnFwQKquxyel2NEQXXOviSEnSUdRrx+dyomzKL+k="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/by-name/wt/wtk/builder.sh b/pkgs/by-name/wt/wtk/builder.sh index ca5157c6d71a..5e90f63c7cba 100644 --- a/pkgs/by-name/wt/wtk/builder.sh +++ b/pkgs/by-name/wt/wtk/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - mkdir unzipped pushd unzipped unzip $src || true diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix index a436a59aead7..ddd820c145f5 100644 --- a/pkgs/by-name/x2/x265/package.nix +++ b/pkgs/by-name/x2/x265/package.nix @@ -1,25 +1,30 @@ -{ lib -, gccStdenv -, stdenv -, fetchurl -, cmake -, nasm +{ + lib, + gccStdenv, + stdenv, + fetchurl, + cmake, + nasm, # NUMA support enabled by default on NUMA platforms: -, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) -, numactl + numaSupport ? ( + stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) + ), + numactl, # Multi bit-depth support (8bit+10bit+12bit): -, multibitdepthSupport ? (stdenv.hostPlatform.is64bit && !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)) + multibitdepthSupport ? ( + stdenv.hostPlatform.is64bit && !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) + ), # Other options: -, cliSupport ? true # Build standalone CLI application -, custatsSupport ? false # Internal profiling of encoder work -, debugSupport ? false # Run-time sanity checks (debugging) -, ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? stdenv.hostPlatform.isx86_64 # Unit tests - only testing x64 assembly -, vtuneSupport ? false # Vtune profiling instrumentation -, werrorSupport ? false # Warnings as errors + cliSupport ? true, # Build standalone CLI application + custatsSupport ? false, # Internal profiling of encoder work + debugSupport ? false, # Run-time sanity checks (debugging) + ppaSupport ? false, # PPA profiling instrumentation + unittestsSupport ? stdenv.hostPlatform.isx86_64, # Unit tests - only testing x64 assembly + vtuneSupport ? false, # Vtune profiling instrumentation + werrorSupport ? false, # Warnings as errors }: let @@ -30,15 +35,18 @@ in stdenv.mkDerivation rec { pname = "x265"; - version = "3.6"; + version = "4.1"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; # Check that x265Version.txt contains the expected version number # whether we fetch a source tarball or a tag from the git repo src = fetchurl { url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz"; - hash = "sha256-ZjUx80HFOJ9GDXMOYuEKT8yjQoyiyhCWk4Z7xf4uKAc="; + hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk="; }; patches = [ @@ -47,62 +55,77 @@ stdenv.mkDerivation rec { sourceRoot = "x265_${version}/source"; - postPatch = '' - substituteInPlace cmake/Version.cmake \ - --replace "unknown" "${version}" \ - --replace "0.0" "${version}" - '' - # There is broken and complicated logic when setting X265_LATEST_TAG for - # mingwW64 builds. This bypasses the logic by setting it at the end of the - # file - + lib.optionalString stdenv.hostPlatform.isMinGW '' - echo 'set(X265_LATEST_TAG "${version}")' >> ./cmake/Version.cmake - ''; + postPatch = + '' + substituteInPlace cmake/Version.cmake \ + --replace-fail "unknown" "${version}" \ + --replace-fail "0.0" "${version}" + '' + # There is broken and complicated logic when setting X265_LATEST_TAG for + # mingwW64 builds. This bypasses the logic by setting it at the end of the + # file + + lib.optionalString stdenv.hostPlatform.isMinGW '' + echo 'set(X265_LATEST_TAG "${version}")' >> ./cmake/Version.cmake + ''; - nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + nativeBuildInputs = [ + cmake + nasm + ] ++ lib.optionals (numaSupport) [ numactl ]; - cmakeFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] + cmakeFlags = + [ + "-DENABLE_ALPHA=ON" + "-DENABLE_MULTIVIEW=ON" + "-DENABLE_SCC_EXT=ON" + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ] # Clang does not support the endfunc directive so use GCC. - ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; + ++ lib.optional ( + stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin + ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ] ++ lib.optionals isCross [ - (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM") - (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64") - ]; + cmakeStaticLibFlags = + [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] + ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ] + ++ lib.optionals isCross [ + (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM") + (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64") + ]; - preConfigure = lib.optionalString multibitdepthSupport '' - cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags - cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON - cmakeFlagsArray+=( - -DEXTRA_LIB="x265-10.a;x265-12.a" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=ON - -DLINKED_12BIT=ON - ) - '' + '' - cmakeFlagsArray+=( - -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 - ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} - -DHIGH_BIT_DEPTH=OFF - -DENABLE_HDR10_PLUS=ON - ${mkFlag cliSupport "ENABLE_CLI"} - ${mkFlag unittestsSupport "ENABLE_TESTS"} - ) - ''; + preConfigure = + lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_/source/build) @@ -114,27 +137,33 @@ stdenv.mkDerivation rec { ''; doCheck = unittestsSupport; + checkPhase = '' runHook preCheck + ./test/TestBench + runHook postCheck ''; - postInstall = '' - rm -f ${placeholder "out"}/lib/*.a - '' - # For mingw, libs are located in $out/bin not $out/lib - + lib.optionalString stdenv.hostPlatform.isMinGW '' - ln -s $out/bin/*.dll $out/lib - ''; + postInstall = + '' + rm -f ${placeholder "out"}/lib/*.a + '' + # For mingw, libs are located in $out/bin not $out/lib + + lib.optionalString stdenv.hostPlatform.isMinGW '' + ln -s $out/bin/*.dll $out/lib + ''; - meta = with lib; { + meta = { description = "Library for encoding H.265/HEVC video streams"; mainProgram = "x265"; - homepage = "https://www.x265.org/"; - changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + homepage = "https://www.x265.org"; + changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${ + lib.strings.replaceStrings [ "." ] [ "-" ] version + }"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ codyopel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index fc5e79830664..84383093528c 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: { ./patches/Use-system-toolchain-for-usr-bin.patch # Suppress warnings due to newer SDKs with unknown keys ./patches/Suppress-unknown-key-warnings.patch + # Don't pipe stdout / stderr of processes launched by xcrun + ./patches/fix-interactive-apps.patch ]; prePatch = '' diff --git a/pkgs/by-name/xc/xcbuild/patches/fix-interactive-apps.patch b/pkgs/by-name/xc/xcbuild/patches/fix-interactive-apps.patch new file mode 100644 index 000000000000..d1533e0b87b1 --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/fix-interactive-apps.patch @@ -0,0 +1,141 @@ +diff --git a/Libraries/process/Headers/process/DefaultLauncher.h b/Libraries/process/Headers/process/DefaultLauncher.h +index cee6e145..698ffe84 100644 +--- a/Libraries/process/Headers/process/DefaultLauncher.h ++++ b/Libraries/process/Headers/process/DefaultLauncher.h +@@ -20,11 +20,14 @@ namespace process { + */ + class DefaultLauncher : public Launcher { + public: +- DefaultLauncher(); ++ DefaultLauncher(bool sync_output); + ~DefaultLauncher(); + + public: + virtual ext::optional launch(libutil::Filesystem *filesystem, Context const *context); ++ ++private: ++ bool sync_output_; + }; + + } +diff --git a/Libraries/process/Sources/DefaultLauncher.cpp b/Libraries/process/Sources/DefaultLauncher.cpp +index a7f14e1a..e9aaf330 100644 +--- a/Libraries/process/Sources/DefaultLauncher.cpp ++++ b/Libraries/process/Sources/DefaultLauncher.cpp +@@ -91,9 +91,18 @@ EscapedToken(const WideString &token) + } + #endif + ++namespace { ++ enum class PipeStatus { ++ UNUSED, ++ CREATED, ++ ERROR ++ }; ++} ++ + DefaultLauncher:: +-DefaultLauncher() : +- Launcher() ++DefaultLauncher(bool sync_output) : ++ Launcher(), ++ sync_output_{sync_output} + { + } + +@@ -199,10 +208,14 @@ launch(Filesystem *filesystem, Context const *context) + + /* Setup parent-child stdout/stderr pipe. */ + int pfd[2]; +- bool pipe_setup_success = true; +- if (pipe(pfd) == -1) { +- ::perror("pipe"); +- pipe_setup_success = false; ++ PipeStatus pipe_status = PipeStatus::UNUSED; ++ if (sync_output_) { ++ if (pipe(pfd) == -1) { ++ ::perror("pipe"); ++ pipe_status = PipeStatus::ERROR; ++ } else { ++ pipe_status = PipeStatus::CREATED; ++ } + } + + /* +@@ -214,22 +227,25 @@ launch(Filesystem *filesystem, Context const *context) + return ext::nullopt; + } else if (pid == 0) { + /* Fork succeeded, new process. */ +- if (pipe_setup_success) { +- /* Setup pipe to parent, redirecting both stdout and stderr */ +- dup2(pfd[1], STDOUT_FILENO); +- dup2(pfd[1], STDERR_FILENO); +- close(pfd[0]); +- close(pfd[1]); +- } else { +- /* No parent-child pipe setup, just ignore outputs from child */ +- int nullfd = open("/dev/null", O_WRONLY); +- if (nullfd == -1) { +- ::perror("open"); +- ::_exit(1); +- } +- dup2(nullfd, STDOUT_FILENO); +- dup2(nullfd, STDERR_FILENO); +- close(nullfd); ++ switch (pipe_status) { ++ case PipeStatus::CREATED: ++ /* Setup pipe to parent, redirecting both stdout and stderr */ ++ dup2(pfd[1], STDOUT_FILENO); ++ dup2(pfd[1], STDERR_FILENO); ++ close(pfd[0]); ++ close(pfd[1]); ++ break; ++ case PipeStatus::ERROR: ++ /* No parent-child pipe setup, just ignore outputs from child */ ++ int nullfd = open("/dev/null", O_WRONLY); ++ if (nullfd == -1) { ++ ::perror("open"); ++ ::_exit(1); ++ } ++ dup2(nullfd, STDOUT_FILENO); ++ dup2(nullfd, STDERR_FILENO); ++ close(nullfd); ++ break; + } + + if (::chdir(cDirectory) == -1) { +@@ -243,7 +259,7 @@ launch(Filesystem *filesystem, Context const *context) + return ext::nullopt; + } else { + /* Fork succeeded, existing process. */ +- if (pipe_setup_success) { ++ if (pipe_status == PipeStatus::CREATED) { + close(pfd[1]); + /* Read child's stdout/stderr through pipe, and output stdout */ + while (true) { +diff --git a/Libraries/xcdriver/Tools/xcbuild.cpp b/Libraries/xcdriver/Tools/xcbuild.cpp +index 3a1baadc..c9340ff5 100644 +--- a/Libraries/xcdriver/Tools/xcbuild.cpp ++++ b/Libraries/xcdriver/Tools/xcbuild.cpp +@@ -19,7 +19,7 @@ main(int argc, char **argv) + { + DefaultFilesystem filesystem = DefaultFilesystem(); + process::DefaultContext processContext = process::DefaultContext(); +- process::DefaultLauncher processLauncher = process::DefaultLauncher(); ++ process::DefaultLauncher processLauncher = process::DefaultLauncher(true); + process::DefaultUser user = process::DefaultUser(); + return xcdriver::Driver::Run(&user, &processContext, &processLauncher, &filesystem); + } +diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp +index 9d6d4576..c177b273 100644 +--- a/Libraries/xcsdk/Tools/xcrun.cpp ++++ b/Libraries/xcsdk/Tools/xcrun.cpp +@@ -469,7 +469,7 @@ main(int argc, char **argv) + { + DefaultFilesystem filesystem = DefaultFilesystem(); + process::DefaultContext processContext = process::DefaultContext(); +- process::DefaultLauncher processLauncher = process::DefaultLauncher(); ++ process::DefaultLauncher processLauncher = process::DefaultLauncher(false); + process::DefaultUser user = process::DefaultUser(); + return Run(&filesystem, &user, &processContext, &processLauncher); + } diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index b98d12137850..93544f928fd6 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -3,8 +3,8 @@ coreutils, fetchFromGitHub, git, - gitUpdater, glibcLocales, + nix-update-script, pythonPackages, }: @@ -12,7 +12,7 @@ let argset = { pname = "xonsh"; - version = "0.19.0"; + version = "0.19.1"; pyproject = true; # PyPI package ships incomplete tests @@ -20,7 +20,7 @@ let owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${argset.version}"; - hash = "sha256-rt402MKnhjC/AYz9Rm6B5RkivcVxveVW2rM/nT/xcNo="; + hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; }; nativeBuildInputs = with pythonPackages; [ @@ -112,7 +112,7 @@ let shellPath = "/bin/xonsh"; python = pythonPackages.python; # To the wrapper wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; - updateScript = gitUpdater { }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/xo/xorg_sys_opengl/builder.sh b/pkgs/by-name/xo/xorg_sys_opengl/builder.sh index ed2c60da2612..d341e5be2a5f 100644 --- a/pkgs/by-name/xo/xorg_sys_opengl/builder.sh +++ b/pkgs/by-name/xo/xorg_sys_opengl/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - mkdir -p $out/lib ln -s /usr/lib/libGL.so.1 $out/lib/ diff --git a/pkgs/by-name/xq/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix index 13670978ec0b..f00ad2486601 100644 --- a/pkgs/by-name/xq/xquartz/system-fonts.nix +++ b/pkgs/by-name/xq/xquartz/system-fonts.nix @@ -6,8 +6,6 @@ stdenv.mkDerivation { xorg.mkfontdir xorg.mkfontscale ]; buildCommand = '' - source $stdenv/setup - for i in ${toString fontDirs} ; do if [ -d $i/ ]; then list="$list $i"; diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index f9a2e0151f6a..c467b38928ea 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "395"; + version = "396"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-KG48qlk46uOOICgnYhVnYp3+quaJ6AcLQTyhE5gJPcg="; + hash = "sha256-Q/lLbQ7stCGamfRjUudG8qtVWOQNki1BGs/5bMd4pqU="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/xx/xxHash/package.nix b/pkgs/by-name/xx/xxHash/package.nix index 59bb68a3136c..684af9642b1b 100644 --- a/pkgs/by-name/xx/xxHash/package.nix +++ b/pkgs/by-name/xx/xxHash/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - hash = "sha256-kofPs01jb189LUjYHHt+KxDifZQWl0Hm779711mvWtI="; + hash = "sha256-h6kohM+NxvQ89R9NEXZcYBG2wPOuB4mcyPfofKrx9wQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-disk/package.nix b/pkgs/by-name/ya/yandex-disk/package.nix index b0056602c387..aca6cf21cbe5 100644 --- a/pkgs/by-name/ya/yandex-disk/package.nix +++ b/pkgs/by-name/ya/yandex-disk/package.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { }; builder = writeText "builder.sh" '' - . $stdenv/setup mkdir -pv $out/bin mkdir -pv $out/share mkdir -pv $out/etc diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix new file mode 100644 index 000000000000..ab1aa514b525 --- /dev/null +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "yggdrasil-jumper"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "one-d-wide"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Op3KBJ911AjB7BIJuV4xR8KHMxBtQj7hf++tC1g7SlM="; + }; + + cargoHash = "sha256-i4w+cUCTzbXMC76HuVUdKh54ww8T9nPqQkL64YAneos="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Reduce latency of a connection over Yggdrasil Network"; + longDescription = '' + An independent project that aims to transparently reduce latency + of a connection over Yggdrasil network, utilizing NAT traversal to + bypass intermediary nodes. It periodically probes for active sessions + and automatically establishes direct peerings over internet with + remote nodes running Yggdrasil-Jumper without requiring any firewall + configuration or port mapping. + ''; + homepage = "https://github.com/one-d-wide/yggdrasil-jumper"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ one-d-wide ]; + }; +} diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 001ec595929d..1bc1c30ae0c5 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -1,23 +1,28 @@ { python3Packages, - fetchPypi, + fetchFromGitHub, ffmpeg, lib, + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.12.27"; + version = "2025.01.15"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "ytdl_sub"; - hash = "sha256-7XZlKGzDLG/MVw198Ii+l29F+Lt53MY5QtHU8k9xJWA="; + src = fetchFromGitHub { + owner = "jmbannon"; + repo = "ytdl-sub"; + tag = version; + hash = "sha256-UjCs71nXi77yvB9BhYxT+2G9I+qHEB5Jnhe+GJuppdY="; }; - pythonRelaxDeps = [ - "yt-dlp" - ]; + postPatch = '' + echo '__pypi_version__ = "${version}"; __local_version__ = "${version}"' > src/ytdl_sub/__init__.py + ''; + + pythonRelaxDeps = [ "yt-dlp" ]; build-system = with python3Packages; [ setuptools @@ -37,6 +42,11 @@ python3Packages.buildPythonApplication rec { "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}" ]; + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/jmbannon/ytdl-sub"; description = "Lightweight tool to automate downloading and metadata generation with yt-dlp"; @@ -47,6 +57,7 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ loc + defelo ]; mainProgram = "ytdl-sub"; }; diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix index 00e0431f6557..0edcff844f72 100644 --- a/pkgs/by-name/za/zap/package.nix +++ b/pkgs/by-name/za/zap/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-ZBDhlrqrRYqSBOKar7V0X8oAOipsA4byxuXAS2diH6c="; + sha256 = "sha256-oHeVCecC7FPUEHTqoM5B8qlkqCKqW+A4AlWkguLn/o0="; }; desktopItems = [ diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index 7d15399b5b8a..e984ca23347e 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "zbus_xmlgen"; - version = "5.0.1"; + version = "5.0.2"; src = fetchCrate { inherit pname version; - hash = "sha256-of+/HA8u+/hRnzXZqlQzL+6A4Hkka7pN+Wl2YdrACQY="; + hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8="; }; - cargoHash = "sha256-+nTXAyBelqP0HQnJ6aGFiX2NobJ/MwEav/3gDry9y2U="; + cargoHash = "sha256-bglcui1OLp2USRpL2kOxU8fw+aLAbbDv5hrg5fxz4cQ="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/by-name/ze/zeromq/package.nix similarity index 91% rename from pkgs/development/libraries/zeromq/4.x.nix rename to pkgs/by-name/ze/zeromq/package.nix index 6801eddc178f..845aef375bc5 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/by-name/ze/zeromq/package.nix @@ -15,6 +15,7 @@ zmqpp, ffmpeg, python3, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config @@ -37,12 +40,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsodium ]; - doCheck = false; # fails all the tests (ctest) - cmakeFlags = [ - (lib.cmakeBool "WITH_LIBSODIUM" true) + (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_CURVE" true) (lib.cmakeBool "ENABLE_DRAFTS" enableDrafts) + (lib.cmakeBool "WITH_LIBSODIUM" true) ]; postPatch = '' @@ -83,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { ; pyzmq = python3.pkgs.pyzmq; ffmpeg = ffmpeg.override { withZmq = true; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = { @@ -92,5 +95,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mpl20; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; + pkgConfigModules = [ "libzmq" ]; }; }) diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix index 1beba7163aeb..6b80713075de 100644 --- a/pkgs/by-name/zl/zlib-ng/package.nix +++ b/pkgs/by-name/zl/zlib-ng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-FeOIFlFMDDd+5EDyr8KKW3G03UDM2xx4QF/wyKyDjq4="; + hash = "sha256-22JX7diwhPaAhqErUdFymeSMzEGQkOp7LdBFwCnx5oc="; }; outputs = [ diff --git a/pkgs/by-name/zv/zvbi/musl-x86_64.patch b/pkgs/by-name/zv/zvbi/musl-x86_64.patch new file mode 100644 index 000000000000..c212a63f1bcc --- /dev/null +++ b/pkgs/by-name/zv/zvbi/musl-x86_64.patch @@ -0,0 +1,81 @@ +From ae143105863a9b8ecc9e46b91df011360e617f8f Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 20 Dec 2024 16:14:08 +0100 +Subject: [PATCH] Use standard va_copy(), not GNU __va_copy() + +va_copy() was standardized in C99. My musl toolchain provides +va_copy(), not __va_copy(). The Glibc documentation recommends +using va_copy() if defined, and otherwise falling back to an +assignment. + +Link: https://sourceware.org/glibc/manual/2.40/html_node/Argument-Macros.html#index-va_005fcopy-1 +--- + src/export.c | 4 ++-- + src/misc.c | 4 ++-- + src/misc.h | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/export.c b/src/export.c +index beb325f..26ae63a 100644 +--- a/src/export.c ++++ b/src/export.c +@@ -1472,7 +1472,7 @@ vbi_export_vprintf (vbi_export * e, + return TRUE; + } + +- __va_copy (ap2, ap); ++ va_copy (ap2, ap); + + offset = e->buffer.offset; + +@@ -1509,7 +1509,7 @@ vbi_export_vprintf (vbi_export * e, + } + + /* vsnprintf() may advance ap. */ +- __va_copy (ap, ap2); ++ va_copy (ap, ap2); + } + + _vbi_export_malloc_error (e); +diff --git a/src/misc.c b/src/misc.c +index 834cc89..288f83d 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -156,7 +156,7 @@ _vbi_vasprintf (char ** dstp, + buf = NULL; + size = 64; + +- __va_copy (ap2, ap); ++ va_copy (ap2, ap); + + for (;;) { + +@@ -183,7 +183,7 @@ _vbi_vasprintf (char ** dstp, + } + + /* vsnprintf() may advance ap. */ +- __va_copy (ap, ap2); ++ va_copy (ap, ap2); + } + + vbi_free (buf); +diff --git a/src/misc.h b/src/misc.h +index 107a982..dbe91b8 100644 +--- a/src/misc.h ++++ b/src/misc.h +@@ -423,9 +423,9 @@ _vbi_time_max (void) + } + #endif + +-/* __va_copy is a GNU extension. */ +-#ifndef __va_copy +-# define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0) ++/* va_copy is C99. */ ++#ifndef va_copy ++# define va_copy(ap1, ap2) do { ap1 = ap2; } while (0) + #endif + + /* Use this instead of strncpy(). strlcpy() is a BSD extension. */ +-- +2.47.0 + diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix index d645c1260017..95dcc01916e6 100644 --- a/pkgs/by-name/zv/zvbi/package.nix +++ b/pkgs/by-name/zv/zvbi/package.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Pj37lJSa1spjC/xrf+yu/ecFCuajb8ingszp6ib2WC8="; }; + # https://github.com/zapping-vbi/zvbi/pull/54 + patches = [ ./musl-x86_64.patch ]; + nativeBuildInputs = [ autoreconfHook validatePkgConfig diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 7beef4bad52c..d9bd84a12c11 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "9.27.8"; + version = "9.29.1"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-6Twyzt2BMozph39GMG3JghA54LYi40c1+WfSbAAO2oM="; + hash = "sha256-uP0WUPhPvjy6CfK0MjLzQGjtRAlDKONXQH8WtW1vJDw="; }; - npmDepsHash = "sha256-2cDuRCxyn/wNgZks2Qg+iwqRX8CVRz8qVYh4ZlCR55I="; + npmDepsHash = "sha256-wRU5CTiwgPvy6exU3/iiuH0fkns+fX7/o0kc0c6VpeU="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d3f4c4f2eb60..15b1528316f8 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -74,12 +74,13 @@ stdenv.mkDerivation rec { "out" "unbundled" "p11kit" + "hashed" ]; nativeBuildInputs = [ buildcatrust ]; buildPhase = '' - mkdir unbundled + mkdir unbundled hashed buildcatrust \ --certdata_input certdata.txt \ --ca_bundle_input "${extraCertificatesBundle}" ${ @@ -89,6 +90,7 @@ stdenv.mkDerivation rec { --ca_bundle_output ca-bundle.crt \ --ca_standard_bundle_output ca-no-trust-rules-bundle.crt \ --ca_unpacked_output unbundled \ + --ca_hashed_unpacked_output hashed \ --p11kit_output ca-bundle.trust.p11-kit ''; @@ -103,6 +105,11 @@ stdenv.mkDerivation rec { # install individual certs in unbundled output install -D -t "$unbundled/etc/ssl/certs" unbundled/*.crt + + # install hashed certs in hashed output + # use cp as install doesn't copy symlinks + mkdir -p $hashed/etc/ssl/certs/ + cp -P hashed/* $hashed/etc/ssl/certs/ ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix deleted file mode 100644 index 5e4cbf659bc2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - dtkdeclarative, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - gio-qt, - freeimage, - ffmpeg_6, - ffmpegthumbnailer, -}: - -stdenv.mkDerivation rec { - pname = "deepin-album"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - udisks2-qt5 - gio-qt - freeimage - ffmpeg_6 - ffmpegthumbnailer - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Fashion photo manager for viewing and organizing pictures"; - homepage = "https://github.com/linuxdeepin/deepin-album"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix deleted file mode 100644 index 750696aee61a..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - wayland, - dwayland, - qt5integration, - qt5platform-plugins, - image-editor, - ffmpeg_6, - ffmpegthumbnailer, - libusb1, - libpciaccess, - portaudio, - libv4l, - gst_all_1, - systemd, -}: - -stdenv.mkDerivation rec { - pname = "deepin-camera"; - version = "6.0.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE="; - }; - - # QLibrary and dlopen work with LD_LIBRARY_PATH - patches = [ ./dont_use_libPath.diff ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \ - --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" - substituteInPlace src/com.deepin.Camera.service \ - --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - wayland - dwayland - qt5integration - qt5platform-plugins - image-editor - libsForQt5.qtbase - libsForQt5.qtmultimedia - ffmpeg_6 - ffmpegthumbnailer - libusb1 - libpciaccess - portaudio - libv4l - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" - "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" - ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libusb1 - libv4l - portaudio - systemd - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Tool to view camera, take photo and video"; - homepage = "https://github.com/linuxdeepin/deepin-camera"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff deleted file mode 100644 index f8e005f577a3..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp -index c96c8b0..fcc11da 100644 ---- a/src/src/gstvideowriter.cpp -+++ b/src/src/gstvideowriter.cpp -@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() - - QString GstVideoWriter::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6c24..6d313a6 100644 ---- a/src/src/mainwindow.cpp -+++ b/src/src/mainwindow.cpp -@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() - - QString CMainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix deleted file mode 100644 index 8f15c0895182..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - libsForQt5, - qt5platform-plugins, - dtkwidget, - dtkdeclarative, - deepin-ocr-plugin-manager, - libraw, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "deepin-image-viewer"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA="; - }; - - patches = [ - (fetchpatch { - name = "fix-build-with-libraw-0_21.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; - hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - qt5platform-plugins - dtkwidget - dtkdeclarative - deepin-ocr-plugin-manager - libraw - freeimage - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Image viewing tool with fashion interface and smooth performance"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix deleted file mode 100644 index bc98fa4e4e4f..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - gsettings-qt, - elfutils, - ffmpeg_6, - ffmpegthumbnailer, - mpv, - xorg, - pcre, - libdvdread, - libdvdnav, - libunwind, - libva, - zstd, - glib, - gst_all_1, - gtest, - libpulseaudio, -}: - -stdenv.mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "6.0.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtx11extras - libsForQt5.qtmultimedia - libsForQt5.qtdbusextended - libsForQt5.qtmpris - gsettings-qt - elfutils - ffmpeg_6 - ffmpegthumbnailer - xorg.libXtst - xorg.libXdmcp - xorg.xcbproto - pcre.dev - libdvdread - libdvdnav - libunwind - libva - zstd - mpv - gtest - libpulseaudio - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - propagatedBuildInputs = [ - libsForQt5.qtmultimedia - libsForQt5.qtx11extras - ffmpegthumbnailer - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" - "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - mpv - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = with lib; { - description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; - mainProgram = "deepin-movie"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - broken = true; # Crash when playing any video - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff deleted file mode 100644 index 7ea1f0da1b23..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/src/backends/mpv/mpv_proxy.h b/src/backends/mpv/mpv_proxy.h -index 1256a06..d76d1c0 100644 ---- a/src/backends/mpv/mpv_proxy.h -+++ b/src/backends/mpv/mpv_proxy.h -@@ -38,6 +38,7 @@ typedef void (*mpv_terminateDestroy)(mpv_handle *ctx); - - static QString libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/common/hwdec_probe.cpp b/src/common/hwdec_probe.cpp -index d70ed0c..ac2516d 100644 ---- a/src/common/hwdec_probe.cpp -+++ b/src/common/hwdec_probe.cpp -@@ -83,6 +83,7 @@ bool HwdecProbe::isFileCanHwdec(const QUrl& url, QList& hwList) - - static QString libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/common/platform/platform_thumbnail_worker.cpp b/src/common/platform/platform_thumbnail_worker.cpp -index 17b2bdd..82db2b9 100644 ---- a/src/common/platform/platform_thumbnail_worker.cpp -+++ b/src/common/platform/platform_thumbnail_worker.cpp -@@ -88,6 +88,7 @@ Platform_ThumbnailWorker::Platform_ThumbnailWorker() - - QString Platform_ThumbnailWorker::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(lib_path); -diff --git a/src/common/thumbnail_worker.cpp b/src/common/thumbnail_worker.cpp -index 2ba2888..c34841e 100644 ---- a/src/common/thumbnail_worker.cpp -+++ b/src/common/thumbnail_worker.cpp -@@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker() - - QString ThumbnailWorker::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(lib_path); -diff --git a/src/libdmr/compositing_manager.cpp b/src/libdmr/compositing_manager.cpp -index 9b117fc..28a11ec 100644 ---- a/src/libdmr/compositing_manager.cpp -+++ b/src/libdmr/compositing_manager.cpp -@@ -237,6 +237,7 @@ bool CompositingManager::isCanHwdec() - - QString CompositingManager::libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/libdmr/filefilter.cpp b/src/libdmr/filefilter.cpp -index 6691df0..b620a62 100644 ---- a/src/libdmr/filefilter.cpp -+++ b/src/libdmr/filefilter.cpp -@@ -72,6 +72,7 @@ FileFilter::FileFilter() - - QString FileFilter::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp -index 18a8095..9ea4abf 100644 ---- a/src/libdmr/playlist_model.cpp -+++ b/src/libdmr/playlist_model.cpp -@@ -449,6 +449,7 @@ PlaylistModel::PlaylistModel(PlayerEngine *e) - - QString PlaylistModel::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/widgets/platform/platform_toolbox_proxy.cpp b/src/widgets/platform/platform_toolbox_proxy.cpp -index 570acac..9da0f97 100644 ---- a/src/widgets/platform/platform_toolbox_proxy.cpp -+++ b/src/widgets/platform/platform_toolbox_proxy.cpp -@@ -709,6 +709,7 @@ private: - - static QString libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/widgets/toolbox_proxy.cpp b/src/widgets/toolbox_proxy.cpp -index 05cbc2c..54731bf 100644 ---- a/src/widgets/toolbox_proxy.cpp -+++ b/src/widgets/toolbox_proxy.cpp -@@ -760,6 +760,7 @@ private: - - static QString libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix deleted file mode 100644 index 33d514f48c25..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - dde-qt-dbus-factory, - image-editor, - gsettings-qt, - xorg, - libusb1, - libv4l, - ffmpeg, - ffmpegthumbnailer, - portaudio, - dwayland, - udev, - gst_all_1, -}: - -stdenv.mkDerivation rec { - pname = "deepin-screen-recorder"; - version = "6.0.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - # disable dock plugins, it's part of dde-shell now - postPatch = '' - substituteInPlace screen_shot_recorder.pro \ - --replace-fail " src/dde-dock-plugins" "" - ( - shopt -s globstar - substituteInPlace **/*.pro **/*.service **/*.desktop \ - --replace-quiet "/usr/" "$out/" - ) - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - dde-qt-dbus-factory - qt5integration - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtx11extras - image-editor - gsettings-qt - xorg.libXdmcp - xorg.libXtst - xorg.libXcursor - libusb1 - libv4l - ffmpeg - ffmpegthumbnailer - portaudio - dwayland - udev - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - udev - gst_all_1.gstreamer - libv4l - ffmpeg - ffmpegthumbnailer - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Screen recorder application for dde"; - homepage = "https://github.com/linuxdeepin/deepin-screen-recorder"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - broken = true; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff deleted file mode 100644 index be3ba3267cbf..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp -index 165a7ce..e1574a5 100644 ---- a/src/gstrecord/gstinterface.cpp -+++ b/src/gstrecord/gstinterface.cpp -@@ -49,6 +49,7 @@ gstInterface::gstInterface() - } - QString gstInterface::libPath(const QString &sLib) - { -+ return sLib; - qInfo() << "gstreamer lib name is " << sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -diff --git a/src/main_window.cpp b/src/main_window.cpp -index e0f6bc5..757abad 100755 ---- a/src/main_window.cpp -+++ b/src/main_window.cpp -@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath() - } - QString MainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp -index b4145fa..97a3f5c 100644 ---- a/src/waylandrecord/avlibinterface.cpp -+++ b/src/waylandrecord/avlibinterface.cpp -@@ -105,6 +105,7 @@ avlibInterface::avlibInterface() - - QString avlibInterface::libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix deleted file mode 100644 index 46a35db365c2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - deepin-movie-reborn, - libvlc, - gst_all_1, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-voice-note"; - version = "6.0.18"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4="; - }; - - patches = [ ./use_v23_dbus_interface.diff ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr" "$out" - substituteInPlace src/common/audiowatcher.cpp \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - deepin-movie-reborn - libsForQt5.qtmultimedia - libsForQt5.qtwebengine - libvlc - gtest - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Simple memo software with texts and voice recordings"; - mainProgram = "deepin-voice-note"; - homepage = "https://github.com/linuxdeepin/deepin-voice-note"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff b/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff deleted file mode 100644 index 213b73e36b41..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e7bfb81..f56f11a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,7 +103,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all") - execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR) - string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}") - string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}") --if (MAJOR_VERSION MATCHES "23") -+if (TRUE) - message("--------------------- OS_BUILD_V23 on") - add_definitions(-DOS_BUILD_V23) - endif() diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index df3b8e7f3fc0..a7e01c215d11 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -21,13 +21,11 @@ let qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; dwayland = callPackage ./library/dwayland { }; dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; gio-qt = callPackage ./library/gio-qt { }; - image-editor = callPackage ./library/image-editor { }; udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; util-dfm = callPackage ./library/util-dfm { }; dtk6core = callPackage ./library/dtk6core { }; @@ -66,22 +64,16 @@ let dde-api-proxy = callPackage ./core/dde-api-proxy { }; #### Dtk Application - deepin-album = callPackage ./apps/deepin-album { }; deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; - deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-voice-note = callPackage ./apps/deepin-voice-note { }; deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages @@ -116,6 +108,14 @@ let go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; + deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 + deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 + deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 + deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 + deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index bbc43448b044..44120eae4e5c 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - substituteAll, + replaceVars, buildGoModule, pkg-config, deepin-gettext-tools, @@ -48,12 +48,10 @@ buildGoModule rec { patches = [ ./0001-dont-set-PATH.diff - (substituteAll { - src = ./0002-fix-custom-wallpapers-path.diff; + (replaceVars ./0002-fix-custom-wallpapers-path.diff { inherit coreutils; }) - (substituteAll { - src = ./0003-aviod-use-hardcode-path.diff; + (replaceVars ./0003-aviod-use-hardcode-path.diff { inherit dbus; }) ]; diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix deleted file mode 100644 index 26549922bd8d..000000000000 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - libsForQt5, - ncnn, - opencv, - vulkan-headers, -}: - -stdenv.mkDerivation rec { - pname = "deepin-ocr-plugin-manager"; - version = "unstable-2023-07-10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = "9b5c9e57c83b5adde383ed404b73f9dcbf5e6a48"; - hash = "sha256-U5lxAKTaQvvlqbqRezPIcBGg+DpF1hZ204Y1+8dt14U="; - }; - - # don't use vendored opencv - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "opencv_mobile" "opencv4" - substituteInPlace src/paddleocr-ncnn/paddleocr.cpp \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - ncnn - opencv - vulkan-headers - ]; - - strictDeps = true; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - meta = with lib; { - description = "Plugin manager of optical character recognition for DDE"; - homepage = "https://github.com/linuxdeepin/deepin-ocr-plugin-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix deleted file mode 100644 index 1154b5e0e89c..000000000000 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - cmake, - libsForQt5, - pkg-config, - opencv, - freeimage, - libmediainfo, - ffmpegthumbnailer, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "image-editor"; - version = "1.0.41"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0="; - }; - - postPatch = '' - substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' - substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - opencv - freeimage - libmediainfo - ffmpegthumbnailer - pcre - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = with lib; { - description = "Image editor lib for dtk"; - homepage = "https://github.com/linuxdeepin/image-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index d331f1eae6a6..12d79cbbf9f4 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, glib, gnome-shell, gettext, @@ -22,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix-gi-path.patch; + (replaceVars ./fix-gi-path.patch { gnomeShell = gnome-shell; }) ]; diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 9e78ddc15225..8fc92494caad 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -4,7 +4,7 @@ fetchFromGitLab, glib, gettext, - substituteAll, + replaceVars, gnome-menus, }: @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix_gmenu.patch; + (replaceVars ./fix_gmenu.patch { gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index e5302645d560..d95679f601c5 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, gjs, vte, gnome, @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix_vte_and_gjs.patch; + (replaceVars ./fix_vte_and_gjs.patch { inherit gjs vte; }) ]; diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 30fef8c4e238..530470a4824d 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -17,7 +17,7 @@ , nvme-cli , procps , smartmontools -, substituteAll +, replaceVars , touchegg , util-linux , vte @@ -72,8 +72,7 @@ super: lib.trivial.pipe super [ (patchExtension "eepresetselector@ulville.github.io" (old: { patches = [ # Needed to find the currently set preset - (substituteAll { - src = ./extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch; + (replaceVars ./extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch { easyeffects_gsettings_path = "${glib.getSchemaPath easyeffects}"; }) ]; @@ -81,8 +80,7 @@ super: lib.trivial.pipe super [ (patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch; + (replaceVars ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch { inherit hddtemp liquidctl lm_sensors procps smartmontools; netcat = netcat-gnu; nvmecli = nvme-cli; @@ -103,11 +101,10 @@ super: lib.trivial.pipe super [ (patchExtension "gtk4-ding@smedius.gitlab.com" (old: { nativeBuildInputs = [ wrapGAppsHook3 ]; patches = [ - (substituteAll { + (replaceVars ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch { inherit gjs; util_linux = util-linux; xdg_utils = xdg-utils; - src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; nautilus_gsettings_path = "${glib.getSchemaPath nautilus}"; }) ]; @@ -129,8 +126,7 @@ super: lib.trivial.pipe super [ (patchExtension "system-monitor@gnome-shell-extensions.gcampax.github.com" (old: { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/system-monitor_at_gnome-shell-extensions.gcampax.github.com.patch; + (replaceVars ./extensionOverridesPatches/system-monitor_at_gnome-shell-extensions.gcampax.github.com.patch { gtop_path = "${libgtop}/lib/girepository-1.0"; }) ]; @@ -138,8 +134,7 @@ super: lib.trivial.pipe super [ (patchExtension "system-monitor-next@paradoxxx.zero.gmail.com" (old: { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch; + (replaceVars ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch { gtop_path = "${libgtop}/lib/girepository-1.0"; }) ]; @@ -148,8 +143,7 @@ super: lib.trivial.pipe super [ (patchExtension "Vitals@CoreCoding.com" (old: { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/vitals_at_corecoding.com.patch; + (replaceVars ./extensionOverridesPatches/vitals_at_corecoding.com.patch { gtop_path = "${libgtop}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index f8a2ef12b80f..2e6d23855ba7 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, glib, gettext, xorg, @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { xprop = "${xorg.xprop}/bin/xprop"; xwininfo = "${xorg.xwininfo}/bin/xwininfo"; }) diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index 431784e78d9c..d70d1bb1e031 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchFromGitHub, libpulseaudio, python3, @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { patches = [ # Fix paths to libpulse and python - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { libpulse = "${libpulseaudio}/lib/libpulse.so"; python = python3.interpreter; }) diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index f4d14750e6c7..bf7881659864 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -6,7 +6,7 @@ fetchpatch2, gitUpdater, linkFarm, - substituteAll, + replaceVars, nixosTests, ayatana-indicator-datetime, bash, @@ -117,8 +117,7 @@ stdenv.mkDerivation (finalAttrs: { }) ./9901-lomiri-Disable-Wizard.patch - (substituteAll { - src = ./9902-Layout-fallback-file.patch; + (replaceVars ./9902-Layout-fallback-file.patch { nixosLayoutFile = "/etc/" + finalAttrs.finalPackage.passthru.etcLayoutsFile; }) ]; diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index fba0305124b9..3c590f7d2bf5 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -4,7 +4,8 @@ fetchFromGitLab, gitUpdater, testers, - boost, + # Pin Boost 1.86 due to use of boost::asio::io_service. + boost186, cmake, cmake-extras, dbus, @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost + boost186 cmake-extras dbus dbus-cpp diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 9ecda8e925d6..a9503c4fbb3f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -5,7 +5,7 @@ nix-update-script, meson, ninja, - substituteAll, + replaceVars, pkg-config, vala, libadwaita, @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { tzdata = tzdata; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 82b10c75df8e..37d55612c396 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll +, replaceVars , meson , ninja , pkg-config @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { # https://github.com/elementary/switchboard-plug-keyboard/issues/324 ./hide-install-unlisted-engines-button.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit onboard libgnomekbd; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index e36eba828f7f..5837552a2d47 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { touchegg = touchegg; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 3c58ca7ef4d4..1a4eccfe26c1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -6,7 +6,7 @@ meson, ninja, pkg-config, - substituteAll, + replaceVars, vala, libadwaita, libgee, @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit networkmanagerapplet; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 115eb32558df..55fe603c7b48 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nix-update-script , linkFarm -, substituteAll +, replaceVars , elementary-greeter , pkg-config , meson @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./sysconfdir-install.patch # Needed until https://github.com/elementary/greeter/issues/360 is fixed - (substituteAll { - src = ./hardcode-fallback-background.patch; + (replaceVars ./hardcode-fallback-background.patch { default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index 3ac8f42b87ab..64a126da8807 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, unstableGitUpdater, - substituteAll, + replaceVars, file-roller, }: @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./exec-path.patch; + (replaceVars ./exec-path.patch { file_roller = file-roller; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 7b3b95b2c834..bd93ae6b2565 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll +, replaceVars , meson , ninja , pkg-config @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { bc = "${bc}/bin/bc"; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index ba30fb48469f..dc8d244b1c6a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - substituteAll, + replaceVars, pkg-config, meson, ninja, @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { elementary_calendar = elementary-calendar; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 24ab81ba0068..53992f8c7b36 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -6,7 +6,7 @@ pkg-config, meson, ninja, - substituteAll, + replaceVars, vala, gtk3, granite, @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6140d85064e5..41d8e5f88275 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, nix-update-script, gnome-power-manager, pkg-config, @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gnome_power_manager = gnome-power-manager; }) ]; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index dc7e8259eeb6..55818dffbe25 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,6 +1,6 @@ { mkDerivation, - substituteAll, + replaceVars, extra-cmake-modules, kdoctools, kcmutils, @@ -75,8 +75,7 @@ mkDerivation { ]; patches = [ - (substituteAll { - src = ./0002-openvpn-binary-path.patch; + (replaceVars ./0002-openvpn-binary-path.patch { inherit openvpn; }) ]; diff --git a/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh index 73be2eb5960a..d20895fd12ba 100644 --- a/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh +++ b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh @@ -7,4 +7,4 @@ fixGprProjectDarwinRpath() { done } -preFixupPhases+=" fixGprProjectDarwinRpath" +appendToVar preFixupPhases fixGprProjectDarwinRpath diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/development/bower-modules/generic/default.nix index ba15b5881602..ff02d6156ea2 100644 --- a/pkgs/development/bower-modules/generic/default.nix +++ b/pkgs/development/bower-modules/generic/default.nix @@ -18,8 +18,6 @@ in pkgs.stdenv.mkDerivation ( inherit bowerPackages; builder = builtins.toFile "builder.sh" '' - source $stdenv/setup - # The project's bower.json is required cp $src/bower.json . diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 78535382a7ca..a443d2d7b495 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index 8a8600f1f639..041c471d79c0 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - pkgdir=$(pwd)/pkg deploydir=$(pwd)/deploy diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index 568c3094107a..21e5c0ffafe8 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - tar xf $src cd */ tarballdir=$(pwd) diff --git a/pkgs/development/compilers/fpc/remove-signature.sh b/pkgs/development/compilers/fpc/remove-signature.sh index 9fed8ab057ce..2968763637cc 100755 --- a/pkgs/development/compilers/fpc/remove-signature.sh +++ b/pkgs/development/compilers/fpc/remove-signature.sh @@ -1,3 +1 @@ -source $stdenv/setup - codesign_allocate -r -i "$1" -o "$1" diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 5d680574ad23..c4a20e7af4bc 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -471,14 +471,12 @@ stdenv.mkDerivation rec { # They're in $out/share/{doc,man}. ''; - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: # * https://github.com/NixOS/nixpkgs/issues/129247 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "pie" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 82ae6ef005bd..bfd674434ef5 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -571,16 +571,15 @@ stdenv.mkDerivation ( checkTarget = "test"; - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + # GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = [ + "format" + "pie" + ]; # big-parallel allows us to build with more than 2 cores on # Hydra which already warrants a significant speedup diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 9e205aa0796d..dc425f885805 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -211,14 +211,12 @@ stdenv.mkDerivation rec { done ''; - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: # * https://github.com/NixOS/nixpkgs/issues/129247 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "pie" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 73873ec823a0..c5a704e8ad86 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -437,14 +437,12 @@ stdenv.mkDerivation rec { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: # * https://github.com/NixOS/nixpkgs/issues/129247 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "pie" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 96bf217884b6..ef4828814854 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -416,14 +416,12 @@ stdenv.mkDerivation rec { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: # * https://github.com/NixOS/nixpkgs/issues/129247 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = [ "pie" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 58df18a2fe4a..9df337bde3ef 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -640,16 +640,12 @@ stdenv.mkDerivation ({ checkTarget = "test"; - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + # GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = [ "format" "pie" ]; # big-parallel allows us to build with more than 2 cores on # Hydra which already warrants a significant speedup diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 248e1d496f73..0655f5631d39 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -584,16 +584,15 @@ stdenv.mkDerivation ( checkTarget = "test"; - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + # GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = [ + "format" + "pie" + ]; # big-parallel allows us to build with more than 2 cores on # Hydra which already warrants a significant speedup diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 388b10a02d02..85c9be094a0d 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 4eef8acb0693..551db285a98f 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,6 +1,4 @@ # -*- shell-script -*- -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup function extract { diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 1662aa52dde2..9bc078df0e44 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -8,6 +8,7 @@ cmake, libxml2, libllvm, + ninja, libclang, version, python3, @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... + # BOLT re-runs tablegen against LLVM sources, so needs them available. cp -r ${monorepoSrc}/llvm/ "$out" chmod -R +w $out/llvm '' @@ -42,20 +43,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ninja python3 ]; buildInputs = [ libllvm - libclang libxml2 ]; - cmakeFlags = - lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") - ] - ++ devExtraCmakeFlags; + cmakeFlags = [ + (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen") + ] ++ devExtraCmakeFlags; postUnpack = '' chmod -R u+w -- $sourceRoot/.. diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 1552eb3993dc..7afa284c25a2 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -60,16 +60,18 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ] ++ [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.tblgen}/bin/clang-tblgen" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ # Added in LLVM15: # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 - "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" - "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" + "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen" + ] ++ lib.optionals (lib.versionOlder release_version "20") [ + # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935 + "-DCLANG_PSEUDO_GEN=${buildLlvmTools.tblgen}/bin/clang-pseudo-gen" + ] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" ++ devExtraCmakeFlags; postPatch = '' @@ -77,9 +79,6 @@ let substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' (cd tools && ln -s ../../clang-tools-extra extra) - '' + lib.optionalString (lib.versionOlder release_version "13") '' - substituteInPlace tools/extra/clangd/quality/CompletionModel.cmake \ - --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp @@ -100,16 +99,6 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" moveToOutput "lib/libclang-cpp.*" "$lib" - '' + (if lib.versionOlder release_version "15" then '' - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - '' else '' - substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - '') + '' - '' + (if lib.versionOlder release_version "15" then '' mkdir -p $python/bin $python/share/{clang,scan-view} '' else '' diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 50c8a3c96834..f72af0f08556 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -148,22 +148,22 @@ stdenv.mkDerivation { postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ - --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + --replace-fail 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versions.major release_version == "18") '' substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ - --replace "" "" + --replace-fail "" "" '') + '' substituteInPlace lib/builtins/int_util.c \ - --replace "#include " "" + --replace-fail "#include " "" '' + (lib.optionalString (!stdenv.hostPlatform.isFreeBSD) # On FreeBSD, assert/static_assert are macros and allowing them to be implicitly declared causes link errors. # see description above for why we're nuking assert.h normally but that doesn't work here. # instead, we add the freebsd.include dependency explicitly '' substituteInPlace lib/builtins/clear_cache.c \ - --replace "#include " "" + --replace-fail "#include " "" substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast release_version "18") "/x86"}.c \ - --replace "#include " "" + --replace-fail "#include " "" '')) + lib.optionalString (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "14") '' # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15. diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 102a43161e3d..c56a8fee1476 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -515,6 +515,18 @@ let # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* llvm = tools.libllvm; + tblgen = callPackage ./tblgen.nix { + patches = builtins.filter + # Crude method to drop polly patches if present, they're not needed for tblgen. + (p: (!lib.hasInfix "-polly" p)) tools.libllvm.patches; + clangPatches = [ + # Would take tools.libclang.patches, but this introduces a cycle due + # to replacements depending on the llvm outpath (e.g. the LLVMgold patch). + # So take the only patch known to be necessary. + (metadata.getVersionFile "clang/gnu-install-dirs.patch") + ]; + }; + libclang = callPackage ./clang { patches = [ diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 630fc7dda43c..f3828cd0b0ff 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -63,23 +63,23 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (lib.versionOlder release_version "19") '' substituteInPlace CMakeLists.txt \ - --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + --replace-fail 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + --replace-fail 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + --replace-fail 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + --replace-fail 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + --replace-fail 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( if (lib.versionOlder release_version "19") then '' substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' \ - 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' + --replace-fail 'COMMAND prepare_builtins' \ + 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' '' else '' diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index d8154025254f..49371bb24883 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -30,7 +30,7 @@ let '') else src; postPatch = lib.optionalString (lib.versionOlder release_version "14") '' - substituteInPlace MachO/CMakeLists.txt --replace \ + substituteInPlace MachO/CMakeLists.txt --replace-fail \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; in @@ -48,8 +48,8 @@ stdenv.mkDerivation (rec { "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ] ++ [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ] ++ devExtraCmakeFlags; # Musl's default stack size is too small for lld to be able to link Firefox. diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a1a7ff535433..2e248209819a 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -24,6 +24,7 @@ , which , sysctl , buildLlvmTools +, updateAutotoolsGnuConfigScriptsHook , debugVersion ? false , doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) @@ -112,7 +113,12 @@ stdenv.mkDerivation (finalAttrs: { "shadowstack" ]; - nativeBuildInputs = [ cmake ] + nativeBuildInputs = [ + cmake + # while this is not an autotools build, it still includes a config.guess + # this is needed until scripts are updated to not use /usr/bin/uname on FreeBSD native + updateAutotoolsGnuConfigScriptsHook + ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) ++ [ python ] ++ optionals enableManpages [ @@ -133,8 +139,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + --replace-fail 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" '' + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 @@ -146,10 +151,10 @@ stdenv.mkDerivation (finalAttrs: { # and thus fails under the sandbox: (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" '' else '' substituteInPlace unittests/Support/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" '') + # This test tries to call the intrinsics `@llvm.roundeven.f32` and # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` @@ -163,25 +168,25 @@ stdenv.mkDerivation (finalAttrs: { # pass there? optionalString (lib.versionAtLeast release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" '' + # fails when run in sandbox optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") '' substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ - --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" + --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" ''))) + # dup of above patch with different conditions optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" '' + # fails when run in sandbox ((optionalString (lib.versionAtLeast release_version "18") '' substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ - --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" + --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" '') + # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading @@ -213,10 +218,10 @@ stdenv.mkDerivation (finalAttrs: { # TODO(@rrbutani): fix/follow-up (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" '' else '' substituteInPlace unittests/Support/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" '') + # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). @@ -226,10 +231,10 @@ stdenv.mkDerivation (finalAttrs: { # FileSystem permissions tests fail with various special bits '' substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" + --replace-fail "Path.cpp" "" rm unittests/Support/Path.cpp substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" + --replace-fail "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp '' + lib.optionalString (lib.versionAtLeast release_version "13") '' rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test @@ -252,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: { optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${./TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" + --replace-fail "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm test/CodeGen/AArch64/wineh4.mir '' + optionalString stdenv.hostPlatform.isAarch32 '' @@ -302,8 +307,8 @@ stdenv.mkDerivation (finalAttrs: { ; do echo "PATCH: $f" substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' + --replace-quiet 'Starting llvm::' 'Starting {{.*}}' \ + --replace-quiet 'Finished llvm::' 'Finished {{.*}}' done '' + # gcc-13 fix @@ -346,6 +351,7 @@ stdenv.mkDerivation (finalAttrs: { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ + "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" @@ -382,7 +388,6 @@ stdenv.mkDerivation (finalAttrs: { "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( let nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; @@ -417,14 +422,13 @@ stdenv.mkDerivation (finalAttrs: { mv $out/share/opt-viewer $python/share/opt-viewer moveToOutput "bin/llvm-config*" "$dev" substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + --replace-fail "$out/bin/llvm-config" "$dev/bin/llvm-config" '' + (if lib.versionOlder release_version "15" then '' substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' else '' substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '') + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index b35a05320a5c..8f2f28c72c65 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -59,14 +59,13 @@ stdenv.mkDerivation rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" + "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/mlir-tblgen" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" "-DLLVM_BUILD_STATIC=ON" "-DLLVM_LINK_LLVM_DYLIB=OFF" - ] ++ lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.mlir}/bin/mlir-tblgen" ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix new file mode 100644 index 000000000000..49cbcb0af2ca --- /dev/null +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -0,0 +1,121 @@ +{ + cmake, + devExtraCmakeFlags ? [ ], + lib, + llvm_meta, + monorepoSrc ? null, + ninja, + patches ? [ ], + python3, + release_version, + runCommand, + src ? null, + stdenv, + version, + clangPatches, +}: + +let + # This is a synthetic package which is not an official part of the llvm-project. + # See https://github.com/NixOS/nixpkgs/pull/362384 for discussion. + # + # LLVM has tools that run at build time. In native builds, these are + # built as a part of the usual build, but in cross builds they need to + # come from buildPackages. + # + # In many scenarios this is a small problem because LLVM from + # buildPackages is already available as a build; but if cross building a + # version of LLVM which is not available (e.g. a new git commit of LLVM) + # this results in two builds of LLVM and clang, one native and one for the + # cross. + # + # Full builds of LLVM are expensive; and unnecessary in this scenario. We + # don't need a native LLVM, only a native copy of the tools which run at + # build time. This is only tablegen and related tooling, which are cheap + # to build. + pname = "llvm-tblgen"; + + src' = + if monorepoSrc != null then + runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + + '' + cp -r ${monorepoSrc}/llvm "$out" + cp -r ${monorepoSrc}/clang "$out" + cp -r ${monorepoSrc}/clang-tools-extra "$out" + cp -r ${monorepoSrc}/mlir "$out" + '' + ) + else + src; + + self = stdenv.mkDerivation (finalAttrs: rec { + inherit pname version patches; + + src = src'; + sourceRoot = "${src.name}/llvm"; + + postPatch = '' + ( + cd ../clang + chmod u+rwX -R . + for p in ${toString clangPatches} + do + patch -p1 < $p + done + ) + ''; + + nativeBuildInputs = [ + cmake + ninja + python3 + ]; + + cmakeFlags = [ + # Projects with tablegen-like tools. + "-DLLVM_ENABLE_PROJECTS=${ + lib.concatStringsSep ";" ( + [ + "llvm" + "clang" + "clang-tools-extra" + ] + ++ lib.optionals (lib.versionAtLeast release_version "16") [ + "mlir" + ] + ) + }" + ] ++ devExtraCmakeFlags; + + # List of tablegen targets. + ninjaFlags = + [ + "clang-tblgen" + "llvm-tblgen" + ] + ++ lib.optionals (lib.versionAtLeast release_version "15") [ + "clang-tidy-confusable-chars-gen" + ] + ++ lib.optionals (lib.versionAtLeast release_version "16") [ + "mlir-tblgen" + ] + ++ + lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20")) + [ + "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935. + ]; + + installPhase = '' + mkdir -p $out + cp -ar bin $out/bin + ''; + }); +in +self diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 606cb70dc3cc..569c0e2dd0d0 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -29,7 +29,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.5".officialRelease.sha256 = "sha256-QxQL4QwUH6e5HWpBvI8yIbZYBNwqqRsZqPH0w/JSiHQ="; + "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI="; "20.0.0-git".gitRelease = { rev = "eb5cda480d2ad81230b2aa3e134e2b603ff90a1c"; rev-version = "20.0.0-unstable-2024-11-26"; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 34632bf4b50d..29d337a3310b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, ecl, coreutils, fetchurl, strace, texinfo, which, writeText, zstd +{ lib, stdenv, callPackage, ecl, coreutils, fetchurl, ps, strace, texinfo, which, writeText, zstd , version # Set this to a lisp binary to use a custom bootstrap lisp compiler for SBCL. # Leave as null to use the default. This is useful for local development of @@ -16,12 +16,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.4.9" = { - sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI="; - }; "2.4.10" = { sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; }; + "2.4.11" = { + sha256 = "sha256-TwPlhG81g0wQcAu+Iy2kG6S9v4G9zKyx1N4kKXZXpBU="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other @@ -80,6 +80,8 @@ stdenv.mkDerivation (self: { which ] ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [ strace + ] ++ lib.optionals (lib.versionOlder "2.4.10" self.version) [ + ps ] ); buildInputs = lib.optionals self.coreCompression ( diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 793535c27d39..c8f893e1afaf 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -11,7 +11,6 @@ git, gnused, nix, - nixfmt-classic, majorVersion, }: @@ -98,17 +97,13 @@ stdenv.mkDerivation rec { git gnused nix - nixfmt-classic ] } versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*' oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" if [ "$oldVersion" != "$latestTag" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix" update-source-version ${pname} "$latestTag" --version-key=version --print-changes - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a58af0c526fa..0632b01e3ef9 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -8,23 +8,25 @@ texinfo, which, }: - stdenv.mkDerivation (finalAttrs: { pname = "tcc"; - version = "0.9.27-unstable-2022-07-15"; + version = "0.9.27-unstable-2025-01-06"; + + outputs = [ + "dev" + "doc" + "info" + "lib" + "man" + "out" + ]; src = fetchFromRepoOrCz { repo = "tinycc"; - rev = "af1abf1f45d45b34f0b02437f559f4dfdba7d23c"; - hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8="; + rev = "f6385c05308f715bdd2c06336801193a21d69b50"; + hash = "sha256-tO3N+NplYy8QUOC2N3x0CO5Ui75j9bQzLSZQF1HQyhY="; }; - outputs = [ - "out" - "info" - "man" - ]; - nativeBuildInputs = [ copyPkgconfigItems perl @@ -57,17 +59,15 @@ stdenv.mkDerivation (finalAttrs: { (makePkgconfigItem libtcc-pcitem) ]; - postPatch = '' - patchShebangs texi2pod.pl - ''; - configureFlags = [ "--cc=$CC" "--ar=$AR" "--crtprefix=${lib.getLib stdenv.cc.libc}/lib" "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include" - "--libpaths=${lib.getLib stdenv.cc.libc}/lib" + # The first libpath will be the one in which tcc will look for libtcc1.a, + # which is need for its tests. + "--libpaths=$lib/lib/tcc:$lib/lib:${lib.getLib stdenv.cc.libc}/lib" # build cross compilers "--enable-cross" ] @@ -75,6 +75,21 @@ stdenv.mkDerivation (finalAttrs: { "--config-musl" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=int-conversion" + ]; + + # Test segfault for static build + doInstallCheck = + !stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postPatch = '' + patchShebangs texi2pod.pl + ''; + preConfigure = let # To avoid "malformed 32-bit x.y.z" error on mac when using clang @@ -90,19 +105,14 @@ stdenv.mkDerivation (finalAttrs: { configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-int" - "-Wno-error=int-conversion" - ]; + installCheckTarget = "test"; - # Test segfault for static build - doCheck = !stdenv.hostPlatform.isStatic; - - checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - rm tests/tests2/{108,114}* - ''; + preInstallCheck = + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + '' + rm tests/tests2/{108,114}* + ''; meta = { homepage = "https://repo.or.cz/tinycc.git"; @@ -132,12 +142,11 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "tcc"; maintainers = with lib.maintainers; [ joachifm - AndersonTorres + onemoresuza ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) -# TODO: more multiple outputs # TODO: self-compilation diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 3576fbe17270..3677f65625bb 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -47,6 +47,8 @@ mkCoqDerivation { release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; enableParallelBuilding = false; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 1373a05b00ec..16d89a49d412 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -46,6 +46,8 @@ mkCoqDerivation { release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; releaseRev = v: "v${v}"; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 9689d4d5eaf2..05da9b148cb5 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -4,10 +4,11 @@ coq, bignums, math-classes, + coq-elpi, version ? null, }: -mkCoqDerivation rec { +(mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = @@ -46,6 +47,8 @@ mkCoqDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = true; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums math-classes @@ -57,4 +60,9 @@ mkCoqDerivation rec { description = "Coq library for constructive analysis"; maintainers = [ maintainers.vbgl ]; }; -} +}).overrideAttrs + (o: { + propagatedBuildInputs = + o.propagatedBuildInputs + ++ lib.optional (lib.versions.isGt "8.19.0" o.version || o.version == "dev") coq-elpi; + }) diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 22f3eb2d9f21..ede84f75f6a7 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -75,7 +75,7 @@ ( o: lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.16") { - propagatedBuildInputs = [ coq.ocamlPackages.findlib ]; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.findlib ]; } // lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.18") { nativeBuildInputs = with coq.ocamlPackages; [ diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 246ac5c617ab..292b5fa5fdc3 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -37,6 +37,8 @@ mkCoqDerivation { release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8="; release."8.19.0".sha256 = "sha256-rsV96W9MPFi/DKsepNPm1QnC2DMemio+uALIgzVYw0w="; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; meta = { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index d448a9c3f74f..1fbc38997b82 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -58,6 +58,15 @@ self: super: { xhtml = null; # Version upgrades + jailbreak-cabal = overrideCabal { + # Manually update jailbreak-cabal to 1.4.1 (which supports Cabal >= 3.14) + # since Hackage bump containing it is tied up in the update to Stackage LTS 23. + version = "1.4.1"; + sha256 = "0q6l608m965s6932xabm7v2kav5cxrihb5qcbrwz0c4xiwrz4l5x"; + + revision = null; + editedCabalFile = null; + } super.jailbreak-cabal; htree = doDistribute self.htree_0_2_0_0; tagged = doDistribute self.tagged_0_8_9; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0449c3f0dd4e..aecc288decef 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -125,9 +125,6 @@ self: super: builtins.intersectAttrs super { # fix errors caused by hardening flags epanet-haskell = disableHardening ["format"] super.epanet-haskell; - # Link the proper version. - zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; - # cabal2nix incorrectly resolves this to pkgs.zip (could be improved over there). streamly-zip = super.streamly-zip.override { zip = pkgs.libzip; }; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 73b813c6b003..ad542da64325 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -11,22 +11,15 @@ libffi, libtool, libunistring, - libiconvReal, makeWrapper, pkg-config, pkgsBuildBuild, readline, -}@args: +}: let # Do either a coverage analysis build or a standard build. builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; - # workaround for libiconv bug in macOS 14/15 - libunistring = - if stdenv.hostPlatform.isDarwin then - args.libunistring.override { libiconv = libiconvReal; } - else - args.libunistring; in builder rec { pname = "guile"; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 1e027408ef67..deb74210bdb7 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -11,22 +11,15 @@ libffi, libtool, libunistring, - libiconvReal, makeWrapper, pkg-config, pkgsBuildBuild, readline, -}@args: +}: let # Do either a coverage analysis build or a standard build. builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; - # workaround for libiconv bug in macOS 14/15 - libunistring = - if stdenv.hostPlatform.isDarwin then - args.libunistring.override { libiconv = libiconvReal; } - else - args.libunistring; in builder rec { pname = "guile"; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index a1227d1774c9..473c05ea8383 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -11,24 +11,17 @@ libffi, libtool, libunistring, - libiconvReal, libxcrypt, makeWrapper, pkg-config, pkgsBuildBuild, readline, writeScript, -}@args: +}: let # Do either a coverage analysis build or a standard build. builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; - # workaround for libiconv bug in macOS 14/15 - libunistring = - if stdenv.hostPlatform.isDarwin then - args.libunistring.override { libiconv = libiconvReal; } - else - args.libunistring; in builder rec { pname = "guile"; diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index 8e81d7eebc38..1b5849a68eb3 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,5 +1,6 @@ { lib, stdenv, octave, buildEnv -, makeWrapper, texinfo +, makeWrapper +, locale, texinfo, glibcLocalesUtf8 , wrapOctave , computeRequiredOctavePackages , extraLibs ? [] @@ -20,7 +21,7 @@ in buildEnv { extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ texinfo wrapOctave ]; + buildInputs = [ locale texinfo wrapOctave ]; # During "build" we must first unlink the /share symlink to octave's /share # Then, we can re-symlink the all of octave/share, except for /share/octave @@ -33,7 +34,9 @@ in buildEnv { cd "${octave}/bin" for prg in *; do if [ -x $prg ]; then - makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" + makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \ + --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \ + --set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive" fi done cd $out diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 204b96fb0712..f86785ac2887 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -106,11 +106,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-gJ+jmnrMhIFb9NxNLX5rIoznWgfzskE/MxOqjgqqMoc="; }; + postPatch = '' + patchShebangs --build build-aux/*.pl + ''; + buildInputs = [ readline ncurses - perl flex qhull graphicsmagick @@ -157,6 +160,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + perl pkg-config gfortran texinfo diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 926841fe1dd0..a1db79c06a86 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.6"; + version = "2.30.11"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-ij9/VhSacUaPbMGX1hx2nz0n8b1tDb1PnC7IO9TlNhE="; + hash = "sha256-2NVZNqYhnAsljuF0BhBSJ5HmE9cS41gJep4Q3VxUGkY="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 6f2f3def2b49..a0ea85c83543 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "appstream"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "dev" "installedTests" ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ximion"; repo = "appstream"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pniZq+rR9wW86QqfRw4WZiBo1F16aSAb1J2RjI4aqE0="; + sha256 = "sha256-UnSJcXH0yWK/dPKgbOx9x3iJjKcKNYFkD2Qs5c3FtM8="; }; patches = [ diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 327ce1100c88..30a454a25bea 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.11"; + version = "0.7.12"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-U6eYuMbi4faV6K0F6ToMG1MZnlqpmBg3xBaWs3BSB2c="; + hash = "sha256-eas842cmAeUltcyUTwJsgMAwMvN9OcqoTIyj/ddeDJg="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 8416743b732e..fb9437819e1b 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -11,6 +11,7 @@ expat, gettext, glib, + autoreconfHook, libiconv, libevent, nixosTests, @@ -127,6 +128,12 @@ stdenv.mkDerivation rec { "fuzz/fuzz-packet.c" ]; }) + # https://github.com/avahi/avahi/pull/659 merged Nov 19 + (fetchpatch { + name = "CVE-2024-52616.patch"; + url = "https://github.com/avahi/avahi/commit/f8710bdc8b29ee1176fe3bfaeabebbda1b7a79f7.patch"; + hash = "sha256-BUQOQ4evKLBzV5UV8xW8XL38qk1rg6MJ/vcT5NBckfA="; + }) ]; depsBuildBuild = [ @@ -137,6 +144,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib + autoreconfHook ]; buildInputs = diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 1da943ee8195..01d35a85d873 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-Zt53Qtry99RAheeh7V24Csg/aMW25DT/3CN/h+BaeoM="; + hash = "sha256-2gK+CUpml6AaHcwNoq0tHLr2NwqtMPx+jP80/LLFFr4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6ef66937f786..eb8c60e3eb27 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -333,7 +333,7 @@ , xeve , xvidcore , xz -, zeromq4 +, zeromq , zimg , zlib , zvbi @@ -835,7 +835,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withXvid [ xvidcore ] ++ optionals withZimg [ zimg ] ++ optionals withZlib [ zlib ] - ++ optionals withZmq [ zeromq4 ] + ++ optionals withZmq [ zeromq ] ++ optionals withZvbi [ zvbi ] ; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 2dfabd5ad643..71c47c43089e 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "24.3.25"; + version = "24.12.23"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA="; + hash = "sha256-6L6Eb+2xGXEqLYITWsNNPW4FTvfPFSmChK4hLusk5gU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 18fdb6859e27..4e2c245dddce 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -199,9 +199,13 @@ stdenv.mkDerivation ( ] ++ lib.optional withGd "--with-gd"; - makeFlags = (args.makeFlags or [ ]) ++ [ - "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ]; + makeFlags = + (args.makeFlags or [ ]) + ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" ] + ++ lib.optionals (stdenv.cc.libc != null) [ + "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib" + "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump" + ]; postInstall = (args.postInstall or "") @@ -269,11 +273,6 @@ stdenv.mkDerivation ( inherit sha256; }; - makeFlags = lib.optionals (stdenv.cc.libc != null) [ - "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib" - "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump" - ]; - # Remove absolute paths from `configure' & co.; build out-of-tree. preConfigure = '' diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index 27894b09b91c..6f10476f1089 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,9 +1,6 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 -source $stdenv/setup - postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 7eb508f27ae9..a675633b503d 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "ncroxon"; repo = "gnu-efi"; rev = version; - hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY="; + hash = "sha256-WTXUIBiyWEVCKfhUUWK5vrK6XmcvsAMl4CuhEw5oYWI="; }; buildInputs = [ pciutils ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 24732a588525..ef4ad0c3af4a 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -16,7 +16,8 @@ cctools, cairo, gnome, - substituteAll, + replaceVars, + replaceVarsWith, buildPackages, gobject-introspection-unwrapped, nixStoreDir ? builtins.storeDir, @@ -63,17 +64,18 @@ stdenv.mkDerivation (finalAttrs: { # Make g-ir-scanner put absolute path to GIR files it generates # so that programs can just dlopen them without having to muck # with LD_LIBRARY_PATH environment variable. - (substituteAll { - src = ./absolute_shlib_path.patch; + (replaceVars ./absolute_shlib_path.patch { inherit nixStoreDir; }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 - (substituteAll { - src = ./absolute_gir_path.patch; + (replaceVars ./absolute_gir_path.patch { cairoLib = "${lib.getLib cairo}/lib"; + # original source code in patch's context + CAIRO_GIR_PACKAGE = null; + CAIRO_SHARED_LIBRARY = null; }) ]; @@ -117,12 +119,14 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-Dgi_cross_ldd_wrapper=${ - substituteAll { + replaceVarsWith { name = "g-ir-scanner-lddwrapper"; isExecutable = true; src = ./wrappers/g-ir-scanner-lddwrapper.sh; - inherit (buildPackages) bash; - buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; + replacements = { + inherit (buildPackages) bash; + buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; + }; } }" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 50571a8f914d..ee048867a278 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -19,13 +19,8 @@ giDiscoverSelf() { } # gappsWrapperArgsHook expects GI_TYPELIB_PATH variable to be set by this. -# Until we have dependency mechanism in generic builder, we need to use this ugly hack. -if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then - preFixupPhases+=" " - preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / giDiscoverSelf gappsWrapperArgsHook }" -else - preFixupPhases+=" giDiscoverSelf" -fi +# Until we have dependency mechanism in generic builder, we need to use this hack. +postInstallHooks+=(giDiscoverSelf) _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e1df48dd95bb..3231bb6c649f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , substituteAll , meson , ninja @@ -46,6 +47,7 @@ , flite , gsm , json-glib +, ajaSupport ? lib.meta.availableOn stdenv.hostPlatform libajantv2 , libajantv2 , libaom , libdc1394 @@ -129,6 +131,12 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit (addDriverRunpath) driverLink; }) + # Add support for newer AJA SDK from next GStreamer release + (fetchpatch { + url = "https://github.com/GStreamer/gstreamer/commit/d68ac0db571f44cae42b57c876436b3b09df616b.patch"; + hash = "sha256-ZXwlHzuPT8kUKt5+HkqFH5tzL9l5NusDXImabj4fBbI="; + relative = "subprojects/${pname}"; + }) ]; nativeBuildInputs = [ @@ -214,6 +222,8 @@ stdenv.mkDerivation rec { libmicrodns ] ++ lib.optionals openh264Support [ openh264 + ] ++ lib.optionals ajaSupport [ + libajantv2 ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland @@ -224,7 +234,6 @@ stdenv.mkDerivation rec { chromaprint flite - libajantv2 libdrm libgudev sbc @@ -300,7 +309,7 @@ stdenv.mkDerivation rec { "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true` - "-Daja=disabled" # should pass libajantv2 via aja-sdk-dir instead + "-Daja=${if ajaSupport then "enabled" else "disabled"}" "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "openh264" openh264Support) diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 45e640e2a708..946b65d98a58 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - genericBuild # !!! hack diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 5ceaa2864086..a5129480ea13 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.16.3"; + version = "4.16.7"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-LsU+B9GMnwA7OeSmqDgFTZJZ4Ei2xMBdgMDQWqch2UQ="; + hash = "sha256-UwPHYk4VpIiAWRud3UM4mvuj3k+5KiGXGVGbsWQs49w="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh index f28a856c4f50..0762285843eb 100644 --- a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh +++ b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh @@ -16,4 +16,4 @@ dropIconThemeCache() { fi } -preFixupPhases="${preFixupPhases-} dropIconThemeCache" +appendToVar preFixupPhases dropIconThemeCache diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index b663839ac53c..b0ad6cece22d 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook_xsl + gtk2 # GLIB_GNU_GETTEXT gtk-doc intltool pkg-config diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index df8b97149d9c..42002b52ccfc 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-shared-library-checks.patch ]; postPatch = "patchShebangs ."; preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes + make CC='${buildPackages.stdenv.cc}/bin/cc -I${lib.getDev buildPackages.zlib}/include -L${buildPackages.zlib}/lib' find_sizes mv find_sizes find_sizes_build make clean @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { perl zlib ]; - buildInputs = [ perl ]; + buildInputs = [ + perl + zlib + ]; strictDeps = true; diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index 8974839dca26..e8612a916532 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -11,6 +11,7 @@ , gmp , autoreconfHook , buildPackages +, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation { @@ -25,7 +26,12 @@ stdenv.mkDerivation { strictDeps = true; depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ autoreconfHook ]; + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ + autoreconfHook + ] ++ [ + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native + updateAutotoolsGnuConfigScriptsHook + ]; buildInputs = [ gmp ]; inherit configureFlags; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 3ecb8693e612..f19b3d7b53df 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit, zlib }: stdenv.mkDerivation rec { pname = "libcdr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit zlib ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 0d7ad1fcea8c..f655b4019349 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -5,23 +5,27 @@ fixDarwinDylibNames, pkgsStatic, cmake, + zlib, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "libdeflate"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${finalAttrs.version}"; - hash = "sha256-KpKY0A1cRV9XR1WrE15Eewf2fDWwIFGjQm/fFCnBDrg="; + hash = "sha256-bucVkRgZdzLe2HFzIP+Trq4+FJ5kLYdIVNUiJ2f52zg="; }; - cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; + cmakeFlags = [ + "-DLIBDEFLATE_BUILD_TESTS=ON" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib ]; passthru.tests = { static = pkgsStatic.libdeflate; @@ -30,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { }; }; + doCheck = true; + meta = with lib; { description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; license = licenses.mit; diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 5ff8055cedee..fcf8e65c4de5 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/meson.build \ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index bc8977c70882..36e232ee0d0d 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.26.2"; + version = "1.27.0"; outputs = [ "bin" "out" "dev" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-Ly832W2U38JuXiqvt6e7u3APynrmwi4Ns98bBdTBnP8="; + hash = "sha256-aeCMZnH4RPvaV4+1kqeOSqIj1ViUlaryEXQAo8KaOQE="; }; patches = [ diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 3e7ee28dde4c..5d2eb67c3a08 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -3,9 +3,17 @@ lib, stdenv, libiconv, + libiconvReal, updateAutotoolsGnuConfigScriptsHook, darwin, -}: +}@args: + +let + # https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html + # macoOS libiconv 14 & 15 do not work with libunistring and a configure test + # added in 1.3 rejects even building with it so use gnu libiconv on darwin + libiconv = if stdenv.hostPlatform.isDarwin then libiconvReal else args.libiconv; +in # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -30,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a639f037641e..8af33e834924 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: { "tcp_ref3" "tcp_ref4" "tcp_bind6_error_inval" - "tcp_bind6_error_addrinuse" "tcp_read_stop" "tcp_unexpected_read" "tcp_write_to_half_open_connection" @@ -98,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { "tcp_open" "tcp_write_queue_order" "tcp_try_write" - "tcp_writealot" "multiple_listen" "delayed_accept" "udp_recv_in_a_row" @@ -109,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { "tty_pty" "condvar_5" "hrtime" - "udp_multicast_join" # Tests that fail when sandboxing is enabled. "fs_event_close_in_callback" "fs_event_watch_dir" @@ -122,11 +119,10 @@ stdenv.mkDerivation (finalAttrs: { "udp_create_early_bad_bind" "fs_event_watch_delete_dir" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # fail on macos < 10.15 (starting in libuv 1.47.0) - "fs_write_alotof_bufs_with_offset" - "fs_write_multiple_bufs" - "fs_read_bufs" + ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder finalAttrs.version "1.49.3") [ + # https://github.com/libuv/libuv/issues/4650 + # can enable on upgrade from 1.49.2 + "udp_mmsg" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # I observe this test failing with some regularity on ARMv7: diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix index 7b4021b37201..61a502adffda 100644 --- a/pkgs/development/libraries/mesa/gbm.nix +++ b/pkgs/development/libraries/mesa/gbm.nix @@ -15,19 +15,9 @@ let common = import ./common.nix { inherit lib fetchFromGitLab; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mesa-libgbm"; - inherit (common) meta; - - version = "24.3.2"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; - hash = "sha256-6EcSOE73wEz+aS4C+GUVfcbJtGB0MvIL4a6zA1ohVGA="; - }; + inherit (common) version src meta; mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0ee09d2416cd..0a713f848e52 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz"; + urls = [ + "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" + "https://ftp.gnu.org/gnu/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" + ]; hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 0791a05e338e..aeaa1919872f 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.10"; + version = "3.10.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-tMUYrbF05ITLSs6lQRjwI4DHEzdx5+m+uYoHhxlO5Hw="; + hash = "sha256-sPzdf8DN6m6A3PHdhbp5SvDVtKV+Jjl+7jvBkyctkTI="; }; } diff --git a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch deleted file mode 100644 index e60ebc9e1efe..000000000000 --- a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index c122b013..04f36bf0 100644 ---- a/src/cmake/Config.cmake.in -+++ b/src/cmake/Config.cmake.in -@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ - # ZLIB_VERSION_STRING is still available for backward compatibility. - # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html - -- if (@ZLIB_VERSION@) # @ZLIB_VERSION@ -- find_dependency(ZLIB @ZLIB_VERSION@) -- else() -- find_dependency(ZLIB @ZLIB_VERSION_STRING@) -- endif() -+ find_dependency(ZLIB) - endif() - - if (NOT TARGET MINIZIP::minizip-ng) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index c300f8a0cd57..8797c2962fbc 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -37,9 +37,6 @@ stdenv.mkDerivation rec { }; patches = [ - # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. - # Needed for zlib >= 1.3 && cmake < 3.27.4. - ./broken-cmake-zlib-version.patch # Fix incorrect line number in test ./line-numbers.patch ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0a48e4da8563..e05c1f65dd12 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -10,6 +10,7 @@ , hdf5 , boost , glib +, glog , gflags , protobuf_21 , config @@ -305,6 +306,7 @@ effectiveStdenv.mkDerivation { boost gflags glib + glog pcre2 protobuf_21 zlib @@ -397,11 +399,13 @@ effectiveStdenv.mkDerivation { cmake pkg-config unzip - ] ++ optionals enablePython [ + ] ++ optionals enablePython ([ pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ optionals enableCuda [ + ] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [ + pythonPackages.pythonImportsCheckHook + ]) ++ optionals enableCuda [ cudaPackages.cuda_nvcc ]; @@ -545,6 +549,8 @@ effectiveStdenv.mkDerivation { popd ''; + pythonImportsCheck = [ "cv2" "cv2.sfm" ]; + passthru = { cudaSupport = enableCuda; diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix index dec10c1b13ab..a06d7994794f 100644 --- a/pkgs/development/libraries/opencv/tests.nix +++ b/pkgs/development/libraries/opencv/tests.nix @@ -49,8 +49,9 @@ let export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata" export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data" - #ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" - export GTEST_FILTER="-AsyncAPICancelation/cancel*" + # ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" + # ignore test due to numerical instability + export GTEST_FILTER="-AsyncAPICancelation/cancel*:Photo_CalibrateDebevec.regression" ''; accuracyTests = lib.optionalString runAccuracyTests '' ${ builtins.concatStringsSep "\n" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0e1c425cbad4..e9ac9cc0d7e8 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.54.0"; + version = "1.55.5"; outputs = [ "bin" @@ -38,10 +38,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = - with finalAttrs; - "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ip7tdQIe5zTX/A/fOmXDu6Ud/v5K5RqbQUpgxwstHtg="; + url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz"; + hash = "sha256-45YSbqCCA8vY7xJjjmIi4uH9iqnKxnQwcv7cXy2CDdg="; }; depsBuildBuild = [ @@ -115,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { - packageName = finalAttrs.pname; + packageName = "pango"; # 1.90 is alpha for API 2. freeze = "1.90.0"; }; diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index b4ed7cac7bec..e558161385a6 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -8,11 +8,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5a7f58CyRDqmeIK0eS0IgUVw4A3YL3GaNckioJk/Yh4="; + hash = "sha256-2j+74/pWA/ncmqvpSKb8jDtFHt0ZWBOGKOlsg2ScHxY="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 74984f5d3bd2..424dd1d60859 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -15,6 +15,7 @@ libiconv, libintl, libjpeg, + libtiff, ninja, openjpeg, pkg-config, @@ -123,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: rec { ++ lib.optionals (!minimal) [ cairo lcms + libtiff curl nss ] diff --git a/pkgs/development/libraries/protobuf/29.nix b/pkgs/development/libraries/protobuf/29.nix index f4965979638e..79d3af637194 100644 --- a/pkgs/development/libraries/protobuf/29.nix +++ b/pkgs/development/libraries/protobuf/29.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "29.1"; - hash = "sha256-8vLDwMZUu7y0gK9wRJ9pAT6wI0n46I5bJo2G05uctS4="; + version = "29.2"; + hash = "sha256-zClgj7m0JK2PNWi/1kA2L+HklzaHoT09KwnVt7Rm4ks="; } // args ) diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 94df0a1a8e66..413368268aa2 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -65,7 +65,7 @@ qtOwnPathsHook() { qtHostPathHook "${!outputBin}" } -preFixupPhases+=" qtOwnPathsHook" +appendToVar preFixupPhases qtOwnPathsHook # Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set. wrapQtAppsHook() { diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 44974bd228c8..7925983f0446 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -4,7 +4,6 @@ buildPackages, mkDerivation, apple-sdk_13, - darwinMinVersionHook, perl, qmake, patches, @@ -35,7 +34,6 @@ mkDerivation ( # Per https://doc.qt.io/qt-5/macos.html#supported-versions ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 - (darwinMinVersionHook "10.13") ]; nativeBuildInputs = diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index 2d858055693c..39b8635e264d 100644 --- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -63,7 +63,7 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then qtHostPathHook "${!outputBin}" } - preFixupPhases+=" qtOwnPathsHook" + appendToVar preFixupPhases qtOwnPathsHook # Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set. wrapQtAppsHook() { diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 7065eae8e631..5290c15fee37 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -228,6 +228,11 @@ stdenv.mkDerivation rec { ./qmlimportscanner-import-path.patch # don't pass qtbase's QML directory to qmlimportscanner if it's empty ./skip-missing-qml-directory.patch + + # Qt treats linker flags without known suffix as libraries since 6.7.2 (see qt/qtbase commit ea0f00d). + # Don't do this for absolute paths (like `/nix/store/…/QtMultimedia.framework/Versions/A/QtMultimedia`). + # Upcoming upstream fix: https://codereview.qt-project.org/c/qt/qtbase/+/613683. + ./dont-treat-abspaths-without-suffix-as-libraries.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch new file mode 100644 index 000000000000..b8927159e70d --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake +index c9d4a69497..dc1a290cfc 100644 +--- a/cmake/QtGenerateLibHelpers.cmake ++++ b/cmake/QtGenerateLibHelpers.cmake +@@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path) + if(NOT file_path MATCHES "^-") # not a linker flag + get_filename_component(basename "${file_path}" NAME_WE) + get_filename_component(ext "${file_path}" EXT) +- if(NOT ext) # seems like a library name without prefix and suffix ++ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") # seems like a library name without prefix and suffix + set(${out_var} "${file_path}" PARENT_SCOPE) + return() + endif() diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 66bda00fe566..e45fce589365 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -7,6 +7,7 @@ stdenv, lib, pkgsBuildBuild, + replaceVars, }: qtModule { @@ -21,12 +22,27 @@ qtModule { strictDeps = true; patches = [ - # prevent headaches from stale qmlcache data - ./disable-disk-cache.patch + # invalidates qml caches created from nix applications at different + # store paths and disallows saving caches of bare qml files in the store. + (replaceVars ./invalidate-caches-from-mismatched-store-paths.patch { + nixStore = builtins.storeDir; + nixStoreLength = builtins.toString ((builtins.stringLength builtins.storeDir) + 1); # trailing / + }) # add version specific QML import path ./use-versioned-import-path.patch ]; + preConfigure = + let + storePrefixLen = builtins.toString ((builtins.stringLength builtins.storeDir) + 1); + in + '' + # "NIX:" is reserved for saved qmlc files in patch 0001, "QTDHASH:" takes the place + # of the old tag, which is otherwise the qt version, invalidating caches from other + # qtdeclarative store paths. + echo "QTDHASH:''${out:${storePrefixLen}:32}" > .tag + ''; + cmakeFlags = [ "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools" @@ -37,4 +53,9 @@ qtModule { ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools" ]; + + meta.maintainers = with lib.maintainers; [ + nickcao + outfoxxed + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch deleted file mode 100644 index 2c10263bdc84..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/qml/jsruntime/qv4engine.cpp -+++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2208,13 +2208,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const - { - if (forceDiskCache()) - return DiskCache::Enabled; -- if (disableDiskCache() || debugger()) -- return DiskCache::Disabled; -- static const DiskCacheOptions options = qmlGetConfigOption< -- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); -- return hasPreview.loadAcquire() -- ? (options & ~DiskCacheOptions(DiskCache::Aot)) // Disable AOT if preview enabled -- : options; -+ return DiskCache::Disabled; - } - - void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch new file mode 100644 index 000000000000..364c3ed838e6 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch @@ -0,0 +1,112 @@ +diff --git a/src/qml/common/qv4compileddata.cpp b/src/qml/common/qv4compileddata.cpp +index 9dee91f713..9dec5cae67 100644 +--- a/src/qml/common/qv4compileddata.cpp ++++ b/src/qml/common/qv4compileddata.cpp +@@ -15,6 +15,8 @@ + #include + #include + ++#include ++ + static_assert(QV4::CompiledData::QmlCompileHashSpace > QML_COMPILE_HASH_LENGTH); + + #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0 +@@ -26,6 +28,35 @@ __attribute__((section(".qml_compile_hash"))) + const char qml_compile_hash[QV4::CompiledData::QmlCompileHashSpace] = QML_COMPILE_HASH; + static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) > QML_COMPILE_HASH_LENGTH, + "Compile hash length exceeds reserved size in data structure. Please adjust and bump the format version"); ++ ++bool nix__isNixApplication() { ++ static const bool value = QCoreApplication::applicationFilePath().startsWith(QStringLiteral("@nixStore@")); ++ return value; ++} ++ ++static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) > ++ /*sha1*/ 20 + /*NIX:*/ 4, ++ "Nix compile hash length exceeds the reserved space in data " ++ "structure. Please review the patch."); ++ ++const QByteArray &nix__applicationHash() { ++ static const QByteArray value = [](){ ++ QCryptographicHash applicationHash(QCryptographicHash::Sha1); ++ applicationHash.addData(QByteArrayView(qml_compile_hash, QML_COMPILE_HASH_LENGTH)); ++ ++ // We only care about the package, not the specific file path. ++ auto view = QCoreApplication::applicationFilePath().sliced(@nixStoreLength@); ++ auto pkgEndIdx = view.indexOf(QStringLiteral("/")); ++ if (pkgEndIdx != -1) view = view.sliced(0, pkgEndIdx); ++ ++ applicationHash.addData(view.toUtf8()); ++ ++ return QByteArray("NIX:") + applicationHash.result(); ++ }(); ++ ++ return value; ++} ++ + #else + # error "QML_COMPILE_HASH must be defined for the build of QtDeclarative to ensure version checking for cache files" + #endif +@@ -69,13 +100,29 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString) + } + + #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0 +- if (qstrncmp(qml_compile_hash, libraryVersionHash, QML_COMPILE_HASH_LENGTH) != 0) { ++ const bool nixUnit = qstrncmp("NIX:", this->libraryVersionHash, 4) == 0; ++ ++ if (nixUnit && !nix__isNixApplication()) { ++ *errorString = QStringLiteral("QML compile hash is for a nix store application."); ++ return false; ++ } ++ ++ const char *targetHash = qml_compile_hash; ++ size_t targetHashLength = QML_COMPILE_HASH_LENGTH; ++ ++ if (nixUnit) { ++ const auto &applicationHash = nix__applicationHash(); ++ targetHash = applicationHash.constData(); ++ targetHashLength = applicationHash.length(); ++ } ++ ++ if (qstrncmp(targetHash, this->libraryVersionHash, targetHashLength) != 0) { + *errorString = QStringLiteral("QML compile hashes don't match. Found %1 expected %2") + .arg(QString::fromLatin1( +- QByteArray(libraryVersionHash, QML_COMPILE_HASH_LENGTH) ++ QByteArray(this->libraryVersionHash, targetHashLength) + .toPercentEncoding()), + QString::fromLatin1( +- QByteArray(qml_compile_hash, QML_COMPILE_HASH_LENGTH) ++ QByteArray(targetHash, targetHashLength) + .toPercentEncoding())); + return false; + } +@@ -213,6 +260,29 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString) + return false; + } + ++#if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0 ++ if (nix__isNixApplication() && unitUrl.scheme() == QStringLiteral("qrc")) { ++ // If the application is running from the nix store, we can safely save ++ // bytecode for its embedded QML files as long as we hash the ++ // application path into the version. This will invalidate the caches ++ // when the store path changes. ++ const auto &applicationHash = nix__applicationHash(); ++ ++ memcpy(const_cast(unitData()->libraryVersionHash), ++ applicationHash.constData(), applicationHash.length()); ++ } else if (unitUrl.path().startsWith(QStringLiteral("@nixStore@"))) { ++ // We don't store bytecode for bare QML files in the nix store as the ++ // paths will change every time the application updates, filling caches ++ // endlessly with junk. ++ *errorString = QStringLiteral("Refusing to save bytecode for bare @nixStore@ path."); ++ return false; ++ } else { ++ // If the QML file is loaded from a normal file path it doesn't matter ++ // if the application itself is running from a nix path, so we fall back ++ // to the default Qt behavior. ++ } ++#endif ++ + return SaveableUnitPointer(unitData()).saveToDisk( + [&unitUrl, errorString](const char *data, quint32 size) { + const QString cachePath = localCacheFilePath(unitUrl); diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 6c74677b337c..b49c286f9df0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -12,8 +12,5 @@ qtModule { qtbase qtquick3d ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 - ) "-faligned-allocation"; meta.mainProgram = "cooker"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index d9da2026079c..02e897b7efda 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -35,13 +35,20 @@ qtModule { url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/24002ac6cbd01dbde4944b63c1f7c87ed2bd72b5.patch"; hash = "sha256-Lz4Gv6FLhFGv7dVpqqcss6/w5jsGA8SKaNeWMHT0A/A="; }) - ]; - # Replace vendored wayland.xml with our matching version - # FIXME: remove when upstream updates past 1.23 - postPatch = '' - cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml - ''; + # run waylandscanner with private-code to avoid conflict with symbols from libwayland + # better solution for https://github.com/NixOS/nixpkgs/pull/337913 + (fetchpatch2 { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/67f121cc4c3865aa3a93cf563caa1d9da3c92695.patch"; + hash = "sha256-uh5lecHlHCWyO1/EU5kQ00VS7eti3PEvPA2HBCL9K0k="; + }) + + # fix crash when attach differ shellsurface to the same shellsurfaceitem + (fetchpatch2 { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/070414dd4155e13583e5e8b16bed1a5b68d32910.patch"; + hash = "sha256-JLTdSEbqM6OSijk0cgC419AdLE+PF5KbFh3ypgYUKz8="; + }) + ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index 3eb27e2dda49..2c8ce27e9595 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qwlroots"; - version = "0.3.0-wlroots0.17-0.18"; + version = "0.5.2"; src = fetchFromGitHub { owner = "vioken"; repo = "qwlroots"; rev = finalAttrs.version; - hash = "sha256-ObXegiJ4LT8bTUxNVJ9wBKN5oILWPDYTsuCy+OCsh3k="; + hash = "sha256-RVIxyAC346gXy05hyT/AtConzO1ZE8lbiCg2Diin6bA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4502b3d9f813..c483d5e3a262 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -16,17 +16,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.47.0"; + version = "3.47.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-g+shpvamSfUG34vTqrhaCPdVbO7V29jep0PqAD/DqVc="; + hash = "sha256-8bLuQSwo10cryVupljaNbwzc8ANir/2tsn7ShsF5VAs="; }; docsrc = fetchurl { url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-3yXJb6+4Cck7jhwlxs/XSPRJ99SmV+jBJNOO/v5Ws04="; + hash = "sha256-bcyommdJAp+6gbwPQYjL1PeKy0jWo+rcbVSK+RF8P0E="; }; outputs = [ "bin" "dev" "man" "doc" "out" ]; @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { "-DSQLITE_ENABLE_FTS3_TOKENIZER" "-DSQLITE_ENABLE_FTS4" "-DSQLITE_ENABLE_FTS5" + "-DSQLITE_ENABLE_PREUPDATE_HOOK" "-DSQLITE_ENABLE_RTREE" + "-DSQLITE_ENABLE_SESSION" "-DSQLITE_ENABLE_STMT_SCANSTATUS" "-DSQLITE_ENABLE_UNLOCK_NOTIFY" "-DSQLITE_SOUNDEX" diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 8381ec78a210..29c6192fd7de 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.47.0"; + version = "3.47.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-9Zw0m+20cCA1hqa20QrbNfKv76SfkeVaZyo2oJqP7fc="; + hash = "sha256-5qRx8SOCJfNMLEjFYBtUAkzFOARDaCMPWf8Gcr4fxiM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 73d37d55db93..d3a92589e474 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] -, enableAqua ? stdenv.hostPlatform.isDarwin, darwin +, enableAqua ? stdenv.hostPlatform.isDarwin , ... }: tcl.mkTclDerivation { @@ -21,10 +21,6 @@ tcl.mkTclDerivation { for file in $(find library/demos/. -type f ! -name "*.*"); do substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' - substituteInPlace unix/configure* \ - --replace-fail " -weak_framework UniformTypeIdentifiers" "" ''; postInstall = '' @@ -62,11 +58,7 @@ tcl.mkTclDerivation { propagatedBuildInputs = [ libXft - ] ++ lib.optionals enableAqua ([ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ - darwin.apple_sdk.frameworks.UniformTypeIdentifiers - ]); + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 85bc5a64f0d8..11ffdc374d64 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # when tests are not run ++ lib.optional doInstallCheck cmocka; - nativeInstallCheckInputs = [ + nativeInstallCheckInputs = lib.optionals doInstallCheck [ cmocka which openssl @@ -126,10 +126,18 @@ stdenv.mkDerivation rec { }' Makefile-test.am ''; - configureFlags = lib.optionals doInstallCheck [ - "--enable-unit" - "--enable-integration" - ]; + configureFlags = + lib.optionals doInstallCheck [ + "--enable-unit" + "--enable-integration" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # sys/prctl.h required + "--disable-tcti-cmd" + # uchar.h required + "--disable-fapi" + "--disable-policy" + ]; postInstall = '' # Do not install the upstream udev rules, they rely on specific @@ -138,7 +146,8 @@ stdenv.mkDerivation rec { ''; doCheck = false; - doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doInstallCheck = + stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase @@ -148,7 +157,7 @@ stdenv.mkDerivation rec { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ baloo ]; }; } diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 57138294db31..85b9d5fe4f92 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.38"; + version = "1.39"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4="; + hash = "sha256-4dzcu/COLgqKAu5dmgvjpqr8OaS1H6fg0vGhZBHLcvo="; }; postPatch = lib.optionalString finalAttrs.doCheck '' diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index bc8d9025dbfd..157d021e10c6 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waylib"; - version = "0.3.0-alpha"; + version = "0.6.10-alpha"; src = fetchFromGitHub { owner = "vioken"; repo = "waylib"; rev = finalAttrs.version; - hash = "sha256-5IWe8VFpLwDSja4to/ugVS80s5+bcAbM6/fg1HPP52Q="; + hash = "sha256-cs4nPYMIOppVuna5qBbgGtPdmVhMrhKkVG7L09NmB/U="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index a3efc646d319..c9141b34a94d 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, darwin }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { patches = [ ./enable-riscv.patch ./enable-powerpc.patch + # big-endian support, from https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/127 + (fetchpatch { + name = "0001-webrtc-audio-processing-big-endian.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/uploads/2994c0512aaa76ebf41ce11c7b9ba23e/webrtc-audio-processing-0.2-big-endian.patch"; + hash = "sha256-zVAj9H8SJureQd0t5O5v1je4ia8/gHJOXYxuEBEB6gg="; + }) ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -22,6 +28,8 @@ stdenv.mkDerivation rec { substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index 280819806838..13ace6249c12 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -6,14 +6,14 @@ buildOctavePackage rec { pname = "netcdf"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk="; + sha256 = "sha256-ydgcKFh4uWuSlr7zw+k1JFUSzGm9tiWmOHV1IWvlgwk="; }; - buildInputs = [ + propagatedBuildInputs = [ netcdf ]; diff --git a/pkgs/development/perl-modules/CryptDES-expose-perl_des_expand_key-and-perl_des_crypt.patch b/pkgs/development/perl-modules/CryptDES-expose-perl_des_expand_key-and-perl_des_crypt.patch new file mode 100644 index 000000000000..607d28c4bb5b --- /dev/null +++ b/pkgs/development/perl-modules/CryptDES-expose-perl_des_expand_key-and-perl_des_crypt.patch @@ -0,0 +1,24 @@ +From 51fda02d223f516c4948606c050bfc732b95f481 Mon Sep 17 00:00:00 2001 +From: Brian Fraser +Date: Thu, 24 Sep 2020 15:00:20 +0200 +Subject: [PATCH] _des.h: expose perl_des_expand_key() and perl_des_crypt() to + prevent implicit delaration errors/warnings + +--- + _des.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/_des.h b/_des.h +index ec56b27..b636cda 100644 +--- a/_des.h ++++ b/_des.h +@@ -4,4 +4,6 @@ typedef unsigned long des_ks[32]; + + void _des_crypt( des_cblock in, des_cblock out, des_ks key, int encrypt ); + void _des_expand_key( des_user_key userKey, des_ks key ); ++void perl_des_expand_key(des_user_key userKey, des_ks ks); ++void perl_des_crypt( des_cblock input, des_cblock output, des_ks ks, int encrypt ); + +-- +2.24.3 (Apple Git-128) + diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index f87bb2b9e177..3c45dc3b4c5a 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" perlFlags= diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index d63e98750dea..87464e23549a 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.16.2"; + version = "5.17.0"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-bSLBk4VWRvErmSqXOEFE0N0K06+NRLmsJ76HegFYah8="; + hash = "sha256-zWmGGSSvV48dSU+Ox2ypPcIxVzr0oru9Eaoh1hQ+WgI="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-nXTk0DlGSEq0bp4+Hls3+epV6JY4H50D6IO/M3evFpE="; + hash = "sha256-xGkyLBy5oXVXs3VHT6fVg82H7Dmfc8VGHV9CEfw3ETY="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-IqQ0gtLAx8lVBccaDsum81FmkYXHKQ5zf27F2Y+H45g="; + hash = "sha256-StVPDWGKseagnkEi9dUX2dvu0+tIN8xxUTWmxKW1kDM="; }; }; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index dd2f90f912e1..ca17eda23dcb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; tag = "v${version}"; - hash = "sha256-KnFf6ge0vUR/C7Rh/c6ZttCGKo9OUIWCUYxk5O+OW7c="; + hash = "sha256-HcbvQL8nASsZcfjAoPbQKNoEkSLp5Vmus2MEa3Dv6Po="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 1dd65e73ab4b..6066eb50a118 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -3,7 +3,7 @@ stdenv, # Enables some expensive tests, useful for verifying an update afdko, - antlr4_9, + antlr4_13, booleanoperations, buildPythonPackage, cmake, @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "afdko"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "adobe-type-tools"; repo = "afdko"; tag = version; - hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8="; + hash = "sha256:0955dvbydifhgx9gswbf5drsmmghry7iyf6jwz6qczhj86clswcm"; }; build-system = [ setuptools-scm ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; buildInputs = [ - antlr4_9.runtime.cpp + antlr4_13.runtime.cpp libxml2.dev ]; @@ -60,11 +60,6 @@ buildPythonPackage rec { ./use-dynamic-system-antlr4-runtime.patch ]; - # Happy new year - postPatch = '' - substituteInPlace tests/tx_data/expected_output/alt-missing-glif.pfb --replace 2023 2024 - ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-error=incompatible-function-pointer-types" "-Wno-error=int-conversion" diff --git a/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch b/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch index 4acc351e7bd7..a3ef7dd23b85 100644 --- a/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch +++ b/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch @@ -1,4 +1,4 @@ -commit 72b0ab672d1080049431eeee07ae6d2556ae9e4a +commit a5fde72bd15e0baba008ea54270a1ffe017544a0 Author: sternenseemann Date: Tue Oct 5 18:17:20 2021 +0200 @@ -8,10 +8,10 @@ Date: Tue Oct 5 18:17:20 2021 +0200 somehow wrap and vendor a version of the proper tool. diff --git a/setup.py b/setup.py -index 50deb781..81417971 100644 +index 973e2826..dba58766 100644 --- a/setup.py +++ b/setup.py -@@ -196,9 +196,7 @@ def main(): +@@ -198,9 +198,7 @@ def main(): setup_requires=[ 'wheel', 'setuptools_scm', diff --git a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch index a8ecb02c3e78..d2184e8d2804 100644 --- a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch +++ b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch @@ -1,4 +1,4 @@ -commit 286b9c6e69691292dce4f2b4beaac8f886da184d +commit 3560653d5d52bf30a52ce971ecfe262b1a09d7a3 Author: sternenseemann Date: Tue Oct 5 18:16:10 2021 +0200 @@ -9,29 +9,29 @@ Date: Tue Oct 5 18:16:10 2021 +0200 called antlr4-runtime, not antlr4_static). diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ce80598..a75b6fb1 100644 +index 88e9cfd0..3df902b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +@@ -36,11 +36,10 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") -add_definitions(-DANTLR4CPP_STATIC) set(ANTLR4_WITH_STATIC_CRT OFF) - # 4.9.3 is the latest ANTLR4 version - set(ANTLR4_TAG tags/4.9.3) +-# 4.9.3 is the latest ANTLR4 version + set(ANTLR4_TAG tags/4.13.2) -include(ExternalAntlr4Cpp) +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) - FIND_PACKAGE(LibXml2) - IF (NOT ${LibXml2_FOUND}) + + if (DEFINED ENV{FORCE_BUILD_LIBXML2}) diff --git a/c/makeotf/lib/cffread/CMakeLists.txt b/c/makeotf/lib/cffread/CMakeLists.txt -index 9a400fde..5452d987 100644 +index 2990035f..fab25a77 100644 --- a/c/makeotf/lib/cffread/CMakeLists.txt +++ b/c/makeotf/lib/cffread/CMakeLists.txt -@@ -13,6 +13,6 @@ else () - endif() +@@ -8,6 +8,6 @@ if (${NEED_LIBXML2_DEPEND}) + add_dependencies(makeotf_cffread ${LIBXML2_TARGET}) endif() -target_link_libraries(makeotf_cffread PUBLIC antlr4_static) @@ -39,15 +39,15 @@ index 9a400fde..5452d987 100644 target_compile_definitions(makeotf_cffread PRIVATE $<$:CFF_DEBUG=1> CFF_T13_SUPPORT=0) diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt -index 3cceceea..9695ea21 100644 +index 60e49458..ada728c0 100644 --- a/c/makeotf/lib/hotconv/CMakeLists.txt +++ b/c/makeotf/lib/hotconv/CMakeLists.txt -@@ -69,7 +69,7 @@ add_library(hotconv STATIC - +@@ -70,7 +70,7 @@ add_library(hotconv STATIC set_property(TARGET hotconv PROPERTY C_STANDARD 99) + set_property(TARGET hotconv PROPERTY CXX_STANDARD 17) target_include_directories(hotconv PRIVATE AFTER $<$:${ANTLR4_INCLUDE_DIRS}>) -target_link_libraries(hotconv PUBLIC antlr4_static) +target_link_libraries(hotconv PUBLIC antlr4-runtime) - if (${LibXml2_FOUND}) - target_link_libraries(hotconv PUBLIC ${LIBXML2_LIBRARY}) + target_link_libraries(hotconv PUBLIC ${CHOSEN_LIBXML2_LIBRARY}) + diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 53049d5ba648..c2ada2f5efe0 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; tag = version; - hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw="; + hash = "sha256-wqJpdD4zd5hToZJaacjhoHEC+rSyLjPs7vwwAN92xHM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 6e307ef3d118..ffa755c21533 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.11.0"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-fg3WusrONJtPO/IpHlXzO17C2OuQe28kprXrBG9PqMY="; + hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 5d8ae4defe57..b9f1f9e1c72a 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.9"; + version = "3.11.11"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-3pZPiDnAlsKX5kXH9OQzhmkBZ0vD2qiy2lpKdvV2vW8="; + hash = "sha256-a4h8oFJxo1TSuhIjdUC0wqJSsepmzq6vjn5mwjw4bIw="; }; patches = [ diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 57f8f5acdc91..0ec07882d17e 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2024.5.1"; + version = "2024.8.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = "aiorun"; tag = "v${version}"; - hash = "sha256-7wgsj44sX2Be/QyvG7KgQ/xSgsr+WPh7eeROeICSHGw="; + hash = "sha256-D+4IceCdPg1Akq1YgPuSGF7yAOhDe8PmioNBE5X7yuQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index c4ee32b65bb9..83d9b4921316 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.21"; + version = "0.0.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; tag = version; - hash = "sha256-bIsJ9o1gPCGJZXrzZbRXzS3ZQURcRaWmGBQZsAdX0eg="; + hash = "sha256-jyNOrtQbQ62bQouu5WLYBWqVS5wUDZFsiqkMMb5p7Ek="; }; pythonRelaxDeps = [ "opencv-python" ]; diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index df70557240df..68190b121656 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.4.23"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; tag = version; - hash = "sha256-d/5ZTSFcQqsiF2rDX92iXO2eHHS+GOBvWFw0MlSwyhE="; + hash = "sha256-8WEOI2J2H4PNhyb9LoIUMofGKx9AHPiPddkQCSdh8/A="; }; patches = [ diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index d3e71a5f9051..7b041139a171 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "appdirs"; version = "1.4.4"; - pypoject = true; + pyproject = true; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5606662fd571..72472a30b7cb 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.5.1"; + version = "3.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,16 +18,9 @@ buildPythonPackage rec { owner = "kislyuk"; repo = "argcomplete"; tag = "v${version}"; - hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec="; + hash = "sha256-Tihb61LGTZ8tKrKKlxZ8scII2+pgzDHUkwVn54zlrug="; }; - patches = [ - # fixes issues with python3Packages.traitlets tests - # https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky - # https://github.com/kislyuk/argcomplete/pull/513 - ./python-3.13-compat.patch - ]; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch deleted file mode 100644 index 8a1aa8354135..000000000000 --- a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7438d1fa962eb736af9754669f200f29c5b6025d Mon Sep 17 00:00:00 2001 -From: liushuyu -Date: Mon, 18 Nov 2024 16:12:54 -0700 -Subject: [PATCH] Preliminary Python 3.13 compatibility - ---- - argcomplete/packages/_argparse.py | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/argcomplete/packages/_argparse.py b/argcomplete/packages/_argparse.py -index d10cf01..10ed00c 100644 ---- a/argcomplete/packages/_argparse.py -+++ b/argcomplete/packages/_argparse.py -@@ -5,6 +5,7 @@ - - # This file contains argparse introspection utilities used in the course of argcomplete execution. - -+import sys - from argparse import ( - ONE_OR_MORE, - OPTIONAL, -@@ -15,6 +16,7 @@ - Action, - ArgumentError, - ArgumentParser, -+ Namespace, - _get_action_name, - _SubParsersAction, - ) -@@ -75,6 +77,19 @@ class IntrospectiveArgumentParser(ArgumentParser): - except for the lines that contain the string "Added by argcomplete". - ''' - -+ def _parse_known_args2(self, args, namespace, intermixed): -+ if args is None: -+ # args default to the system args -+ args = sys.argv[1:] -+ else: -+ # make sure that args are mutable -+ args = list(args) -+ -+ # default Namespace built from parser defaults -+ if namespace is None: -+ namespace = Namespace() -+ return self._parse_known_args(args, namespace) -+ - def _parse_known_args(self, arg_strings, namespace): - _num_consumed_args.clear() # Added by argcomplete - self._argcomplete_namespace = namespace diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 72db292342b5..5fa3f4f7cb2b 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "asf-search"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-mOhY64Csxdc/DYS1OlbstxYEodtpXTVyPwd4B1jrDK8="; + hash = "sha256-9NyBDpCIsRBPN2965SR106h6hxwML7kXv6sY3YlPseA="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 86e604c0ce14..01c25a4c2be6 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.3.5"; # Check whether the version is compatible with pylint + version = "3.3.8"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; tag = "v${version}"; - hash = "sha256-IFcBb0BP0FRYCztV3FscBPTDeKrGbr23nxeibSuNRno="; + hash = "sha256-KKQuLomCHhVYMX1gE9WuqbXOfsf2izGlLE0Ml62gY3k="; }; nativeBuildInputs = [ setuptools ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/PyCQA/astroid/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/PyCQA/astroid/blob/v${version}/ChangeLog"; description = "Abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 3f60a9f48bfb..639ca2e8873a 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; tag = "v${version}"; - hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8="; + hash = "sha256-9OJ5XbzpHMHsFjf5oVyHjn5zqmAxRuSItWP4sQx8jD4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 89ff93e94309..93e4a7addef2 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -5,7 +5,7 @@ rustPlatform, rustc, setuptools, - setuptools-rust, + setuptoolsRustBuildHook, fetchPypi, pythonOlder, pytestCheckHook, @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - setuptools-rust + setuptoolsRustBuildHook rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index a99da96fff26..dd1a4268a4aa 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, hatchling, pytestCheckHook, + pythonAtLeast, typing-extensions, }: @@ -29,6 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "beartype" ]; + # this test is not run upstream, and broke in 3.13 (_nparams removed) + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + "test_door_is_subhint" + ]; + meta = { description = "Fast runtime type checking for Python"; homepage = "https://github.com/beartype/beartype"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 7dd49e5c2fa1..9c5aa855cec4 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.0"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-L3Zss6EAAMCEZPSJTM5gf2VwRhnJaXGXD9SaaB0IdbM="; + hash = "sha256-9AHlhcx99N37PgL7lcXs+G59QVYcPvuAK6RgjhrUtmA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index aa3ec95ab67c..12f96cf321c5 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.0"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-cfDQdIZk25v4TMo0Zq7SQnzEao3eN1OVMIsPJxoecZs="; + hash = "sha256-yWCewYS9RFEhq1UpZCv3c9Qgzcckfy0HqAghr+mj9nA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index a376fd413d47..a3ed8ceea17f 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.6.4"; + version = "5.6.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HFM8UN3oa+8caVBgIFSg/6PDduiw4gx7j1sQh5P2mD4="; + hash = "sha256-toKCBnfuHbukX32hGJjScg+S4Gvjas7CkIZ9Xr89fgk="; }; build-system = [ diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index cef8cc71e918..5bd8e9acf680 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.3.2"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; tag = version; - hash = "sha256-T9lnlS05Ogb2eLLHYWFnjBtRaB/OBqGWHQ/2WLunrNY="; + hash = "sha256-de6rg/e9RPfuO44+/Uipad75YqZQrnqiSPopfBNOFP8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index f352096610cf..ab09f5896b4a 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,31 +2,21 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch2, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "colorlog"; - version = "6.8.2"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Pj4HmkH+taG2T5eLXqT0YECpTxHw6Lu4Jh49u+ymTUQ="; + hash = "sha256-v7pUobk7lPVOH0/kg5VyWj2S/SpK9wL2vXCUa9wMasI="; }; - patches = [ - (fetchpatch2 { - name = "python313-compat.patch"; - url = "https://github.com/borntyping/python-colorlog/commit/607485def2d60b60c40c0d682574324b47fc30ba.patch"; - hash = "sha256-oO0efAOq7XIwt40Nq5pn2eXen1+p5FiUMDihn8fYAFg="; - includes = [ "colorlog/wrappers.py" ]; - }) - ]; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "colorlog" ]; diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index d57701eb250d..3f902b0128e9 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -1,20 +1,20 @@ { - lib, buildPythonPackage, - fetchFromGitHub, - fetchpatch2, - poetry-core, - pythonOlder, ebooklib, + fetchFromGitHub, + lib, lxml, + nix-update-script, pillow, + poetry-core, pypdf, python-slugify, + pythonOlder, }: buildPythonPackage rec { pname = "comicon"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,29 +22,14 @@ buildPythonPackage rec { owner = "potatoeggy"; repo = "comicon"; tag = "v${version}"; - hash = "sha256-0AGCTnStyBVL7DVkrUFyD60xnuuO1dcl+Twdyy+uq1Y="; + hash = "sha256-jZ/ZhSFg0ZPTYI10s8Cn1s9UZRFFnuLjS96lnUFVekQ="; }; - patches = [ - # Upstream forgot to bump the version before tagging - # See https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e - (fetchpatch2 { - name = "comicon-version-bump.patch"; - url = "https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e.diff"; - hash = "sha256-ZHltw4OSYuHF8mH0kBZDsuozPy08Bm7nme+XSwfGNn8="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pillow" - "pypdf" - ]; - - propagatedBuildInputs = [ + dependencies = [ ebooklib lxml pillow @@ -52,15 +37,21 @@ buildPythonPackage rec { python-slugify ]; + pythonRelaxDeps = [ + "pillow" + ]; + doCheck = false; # test artifacts are not public pythonImportsCheck = [ "comicon" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}"; description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; homepage = "https://github.com/potatoeggy/comicon"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 87a630249446..1758da63ed20 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -1,13 +1,17 @@ { lib, + buildPackages, buildPythonPackage, fetchFromGitHub, + python, pythonOlder, + python3, # build meson, meson-python, ninja, + nukeReferences, pybind11, # propagates @@ -21,7 +25,9 @@ # tests matplotlib, pillow, + pytest-xdist, pytestCheckHook, + wurlitzer, }: let @@ -39,9 +45,16 @@ let hash = "sha256-QvAIV2Y8H3oPZCF5yaqy2KWfs7aMyRX6aAU5t8E9Vpo="; }; + # prevent unnecessary references to the build python when cross compiling + postPatch = '' + substituteInPlace lib/contourpy/util/_build_config.py.in \ + --replace-fail '@python_path@' "${python.interpreter}" + ''; + nativeBuildInputs = [ meson ninja + nukeReferences pybind11 ]; @@ -63,6 +76,8 @@ let matplotlib pillow pytestCheckHook + pytest-xdist + wurlitzer ]; passthru.tests = { @@ -73,6 +88,12 @@ let pythonImportsCheck = [ "contourpy" ]; + # remove references to buildPackages.python3, which is not allowed for cross builds. + preFixup = '' + nuke-refs -e "${buildPackages.python3}" \ + $out/${python3.sitePackages}/contourpy/util/{_build_config.py,__pycache__/_build_config.*} + ''; + meta = with lib; { changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}"; description = "Python library for calculating contours in 2D quadrilateral grids"; diff --git a/pkgs/development/python-modules/copykitten/default.nix b/pkgs/development/python-modules/copykitten/default.nix new file mode 100644 index 000000000000..385cfe79401e --- /dev/null +++ b/pkgs/development/python-modules/copykitten/default.nix @@ -0,0 +1,51 @@ +{ + fetchFromGitHub, + buildPythonPackage, + rustPlatform, + lib, + pillow, +}: + +buildPythonPackage rec { + pname = "copykitten"; + version = "1.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Klavionik"; + repo = "copykitten"; + tag = "v${version}"; + hash = "sha256-S4IPVhYk/o15LQK1AB8VpdrHwIwTZyvmI2+e27/vDLs="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-Qgg2S1nRwWs2O81huj1g4wq7v4G377T+V8/1rjhz1ZE="; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + dependencies = [ + pillow + ]; + + # The tests get/set the contents of the clipboard by running subprocesses. + # On Darwin, the tests try to use `pbcopy`/`pbpaste`, which aren't packaged in Nix. + # On Linux, I tried adding `xclip` to `nativeCheckInputs`, but got errors about + # displays being null and the clipboard never being initialized. + doCheck = false; + + pythonImportsCheck = [ "copykitten" ]; + + meta = { + description = "Robust, dependency-free way to use the system clipboard in Python"; + homepage = "https://github.com/Klavionik/copykitten"; + changelog = "https://github.com/Klavionik/copykitten/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.samasaur ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 71dea8620e2d..cbc291516d53 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg="; + hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk="; }; build-system = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 384d8d07c278..f14019c28c57 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gXYGv2YbcdM+HQEkIZB6T4+wndgbfT464Xmzl4Agu/E="; + hash = "sha256-qqAXpqKAWBkC9zz1zhaVcStlmKAyvhTPq4H5fEdfg7g="; }; preBuild = '' diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 9b1e0aebe73b..1227553fc55e 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail 'documentation =' 'Documentation =' \ --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index 4c6de5beccd9..c76e36e6b21f 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -24,12 +24,15 @@ buildPythonPackage rec { --replace '"pytest-runner", ' "" ''; - nativeBuildInputs = [ + dependencies = [ setuptools wheel cython ]; + # workaround https://github.com/pytries/datrie/issues/101 + env.CFLAGS = "-Wno-error=incompatible-pointer-types"; + nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 66ff5dc526ef..1ee4ca70b6c6 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.12.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,20 +40,18 @@ buildPythonPackage rec { # Unfortunately, upstream doesn't tag commits on GitHub, and the pypi source # doesn't include tests. TODO: Write an update script that will detect the # version from `dbt_common/__about__.py`. - rev = "5a401a9e8dd46e4582ac4edd2883e34714e77530"; - hash = "sha256-SIMg6ewnE6kY+drqcPlYrxt1XlWBurZU62FI/QnHAHY="; + rev = "965ad815f0dd546678d2595a3010d81f344f8b73"; + hash = "sha256-63gWkETi52uOrO0FTPwM831UHECqcyCtb7wVHQuujnc="; }; - patches = [ - # https://github.com/dbt-labs/dbt-common/pull/211 - ./protobuf_5.patch - ]; - build-system = [ hatchling ]; pythonRelaxDeps = [ "agate" "deepdiff" + # 0.6.x -> 0.7.2 doesn't seem too risky at a glance + # https://pypi.org/project/isodate/0.7.2/ + "isodate" ]; dependencies = [ diff --git a/pkgs/development/python-modules/dbt-common/protobuf_5.patch b/pkgs/development/python-modules/dbt-common/protobuf_5.patch deleted file mode 100644 index 4573011301ef..000000000000 --- a/pkgs/development/python-modules/dbt-common/protobuf_5.patch +++ /dev/null @@ -1,113 +0,0 @@ -From f7c480139015cb8746f3fa751dc72b788d0ce8a0 Mon Sep 17 00:00:00 2001 -From: Eric Hauser -Date: Sat, 19 Oct 2024 15:52:16 -0600 -Subject: [PATCH] upgrade protobuf to >=5,<6 - ---- - dbt_common/events/base_types.py | 7 +++++-- - dbt_common/events/functions.py | 2 +- - dbt_common/events/types_pb2.py | 18 ++++++++++++++---- - pyproject.toml | 4 ++-- - 4 files changed, 22 insertions(+), 9 deletions(-) - -diff --git a/dbt_common/events/base_types.py b/dbt_common/events/base_types.py -index 781b2a0e..2f11e4c7 100644 ---- a/dbt_common/events/base_types.py -+++ b/dbt_common/events/base_types.py -@@ -91,15 +91,18 @@ def __getattr__(self, key): - - def to_dict(self): - return MessageToDict( -- self.pb_msg, preserving_proto_field_name=True, including_default_value_fields=True -+ self.pb_msg, -+ preserving_proto_field_name=True, -+ always_print_fields_with_no_presence=True, - ) - - def to_json(self) -> str: - return MessageToJson( - self.pb_msg, - preserving_proto_field_name=True, -- including_default_value_fields=True, -+ always_print_fields_with_no_presence=True, - indent=None, -+ sort_keys=True, - ) - - def level_tag(self) -> EventLevel: -diff --git a/dbt_common/events/functions.py b/dbt_common/events/functions.py -index 4e055aa4..86d68237 100644 ---- a/dbt_common/events/functions.py -+++ b/dbt_common/events/functions.py -@@ -97,7 +97,7 @@ def msg_to_dict(msg: EventMsg) -> dict: - msg_dict = MessageToDict( - msg, - preserving_proto_field_name=True, -- including_default_value_fields=True, # type: ignore -+ always_print_fields_with_no_presence=True, - ) - except Exception as exc: - event_type = type(msg).__name__ -diff --git a/dbt_common/events/types_pb2.py b/dbt_common/events/types_pb2.py -index 6574462e..1a3b91a5 100644 ---- a/dbt_common/events/types_pb2.py -+++ b/dbt_common/events/types_pb2.py -@@ -1,12 +1,22 @@ - # -*- coding: utf-8 -*- - # Generated by the protocol buffer compiler. DO NOT EDIT! -+# NO CHECKED-IN PROTOBUF GENCODE - # source: types.proto --# Protobuf Python Version: 4.25.2 -+# Protobuf Python Version: 5.28.2 - """Generated protocol buffer code.""" - from google.protobuf import descriptor as _descriptor - from google.protobuf import descriptor_pool as _descriptor_pool -+from google.protobuf import runtime_version as _runtime_version - from google.protobuf import symbol_database as _symbol_database - from google.protobuf.internal import builder as _builder -+_runtime_version.ValidateProtobufRuntimeVersion( -+ _runtime_version.Domain.PUBLIC, -+ 5, -+ 28, -+ 2, -+ '', -+ 'types.proto' -+) - # @@protoc_insertion_point(imports) - - _sym_db = _symbol_database.Default() -@@ -20,9 +30,9 @@ - _globals = globals() - _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) - _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'types_pb2', _globals) --if _descriptor._USE_C_DESCRIPTORS == False: -- DESCRIPTOR._options = None -- _globals['_EVENTINFO_EXTRAENTRY']._options = None -+if not _descriptor._USE_C_DESCRIPTORS: -+ DESCRIPTOR._loaded_options = None -+ _globals['_EVENTINFO_EXTRAENTRY']._loaded_options = None - _globals['_EVENTINFO_EXTRAENTRY']._serialized_options = b'8\001' - _globals['_EVENTINFO']._serialized_start=62 - _globals['_EVENTINFO']._serialized_end=335 -diff --git a/pyproject.toml b/pyproject.toml -index 2e40385c..c2878d15 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -36,7 +36,7 @@ dependencies = [ - "Jinja2>=3.1.3,<4", - "mashumaro[msgpack]>=3.9,<4.0", - "pathspec>=0.9,<0.13", -- "protobuf>=4.0.0,<5.0.0", -+ "protobuf>=5.0,<6.0", - "python-dateutil>=2.0,<3.0", - "requests<3.0.0", # needs to match dbt-core - "typing-extensions>=4.4,<5.0", -@@ -52,7 +52,7 @@ lint = [ - "pytest>=7.3,<8.0", # needed for linting tests - "types-Jinja2>=2.11,<3.0", - "types-jsonschema>=4.17,<5.0", -- "types-protobuf>=4.24,<5.0", -+ "types-protobuf>=5.0,<6.0", - "types-python-dateutil>=2.8,<3.0", - "types-PyYAML>=6.0,<7.0", - "types-requests" diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index e907a0daa7da..d87103d4d0a1 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.11"; + version = "1.8.12"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; tag = "v${version}"; - hash = "sha256-C/cLUMQNmiLn3z93LOg++3WeDUihMR9O3XKouL4uPqw="; + hash = "sha256-9hkHvanetjZ3Rww3DdTEcij47DgzhTRTk2rrtrJiQBU="; }; patches = diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index ecb6e3575ca9..de4caf5f86b1 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -7,7 +7,6 @@ djangorestframework-simplejwt, fetchFromGitHub, python, - pythonOlder, responses, setuptools, unittest-xml-reporting, @@ -15,23 +14,19 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "6.0.0"; + version = "7.0.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; tag = version; - hash = "sha256-fNy1uN3oH54Wd9+EqYpiV0ot1MbSSC7TZoAARQeR81s="; + hash = "sha256-bus7Sf5H4PA5YFrkX7hbALOq04koDz3KTO42hHFJPhw="; }; postPatch = '' substituteInPlace setup.py \ --replace-fail "==" ">=" - substituteInPlace dj_rest_auth/tests/test_api.py \ - --replace-fail "assertEquals" "assertEqual" ''; build-system = [ setuptools ]; @@ -40,7 +35,9 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - optional-dependencies.with_social = [ django-allauth ]; + optional-dependencies.with_social = [ + django-allauth + ] ++ django-allauth.optional-dependencies.socialaccount; nativeCheckInputs = [ djangorestframework-simplejwt diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 0b5ce8d6154f..879b61069e5b 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -12,19 +12,22 @@ gettext, # dependencies + asgiref, django, + + # optional-dependencies + fido2, python3-openid, + python3-saml, requests, requests-oauthlib, pyjwt, - - # optional-dependencies - python3-saml, qrcode, # tests pillow, pytestCheckHook, + pytest-asyncio, pytest-django, # passthru tests @@ -33,36 +36,48 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.61.1"; + version = "65.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pennersr"; repo = "django-allauth"; tag = version; - hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg="; + hash = "sha256-IgadrtOQt3oY2U/+JWBs5v97aaWz5oinz5QUdGXBqO4="; }; nativeBuildInputs = [ gettext + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + asgiref django - pyjwt - python3-openid - requests - requests-oauthlib - ] ++ pyjwt.optional-dependencies.crypto; + ]; - preBuild = "${python.interpreter} -m django compilemessages"; + preBuild = '' + ${python.interpreter} -m django compilemessages + ''; optional-dependencies = { + mfa = [ + fido2 + qrcode + ]; + openid = [ python3-openid ]; saml = [ python3-saml ]; - mfa = [ qrcode ]; + socialaccount = [ + requests + requests-oauthlib + pyjwt + ] ++ pyjwt.optional-dependencies.crypto; + steam = [ python3-openid ]; }; pythonImportsCheck = [ "allauth" ]; @@ -70,6 +85,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pillow pytestCheckHook + pytest-asyncio pytest-django ] ++ lib.flatten (builtins.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 387250090ded..880512f617de 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -42,6 +43,8 @@ buildPythonPackage rec { postgresqlTestHook ]; + doCheck = stdenv.hostPlatform.isLinux; # postgres fails to allocate shm on darwin + postgresqlTestUserOptions = "LOGIN SUPERUSER"; checkPhase = '' diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 1efb444ef24b..d0bd44d36a4b 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,38 +1,39 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # dependencies + distutils, django, - persisting-theory, - six, - - # tests djangorestframework, + fetchFromGitHub, + persisting-theory, pytest-django, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.15.0"; - format = "setuptools"; + version = "1.17.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "agateblue"; repo = "django-dynamic-preferences"; tag = version; - hash = "sha256-S0PAlSrMOQ68mX548pZzARfau/lytXWC4S5uVO1rUmo="; + hash = "sha256-irnwoWqQQxPueglI86ZIOt8wZcEHneY3eyATBXOuk9Y="; }; + build-system = [ + setuptools + distutils + ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ - six - persisting-theory - ]; + dependencies = [ persisting-theory ]; nativeCheckInputs = [ djangorestframework @@ -42,15 +43,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dynamic_preferences" ]; - # Remove once https://github.com/agateblue/django-dynamic-preferences/issues/309 is fixed - doCheck = pythonOlder "3.12"; - env.DJANGO_SETTINGS = "tests.settings"; meta = with lib; { - changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst"; - homepage = "https://github.com/EliotBerriot/django-dynamic-preferences"; description = "Dynamic global and instance settings for your django project"; + changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst"; + homepage = "https://github.com/agateblue/django-dynamic-preferences"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index 4820a064658e..47d4cf94731f 100644 --- a/pkgs/development/python-modules/django-environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix @@ -1,31 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, django, - six, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-environ"; - version = "0.11.2"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4="; + pname = "django_environ"; + inherit version; + hash = "sha256-In3IkUU91b3nacNEnPSnS28u6PerI2HJOgcGj0F5BBo="; }; + build-system = [ setuptools ]; + + buildInputs = [ django ]; + # The testsuite fails to modify the base environment doCheck = false; - propagatedBuildInputs = [ - django - six - ]; + + pythonImportsCheck = [ "environ" ]; meta = with lib; { description = "Utilize environment variables to configure your Django application"; homepage = "https://github.com/joke2k/django-environ/"; + changelog = "https://github.com/joke2k/django-environ/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix index 0e60a5ae5aef..51e6f62fecf2 100644 --- a/pkgs/development/python-modules/django-htmx/default.nix +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -1,32 +1,34 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, asgiref, + buildPythonPackage, django, - pytestCheckHook, + fetchFromGitHub, pytest-django, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-htmx"; - version = "1.19.0"; + version = "1.21.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "adamchainz"; repo = "django-htmx"; rev = version; - hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so="; + hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g="; }; build-system = [ setuptools ]; - dependencies = [ - asgiref - django - ]; + buildInputs = [ django ]; + + dependencies = [ asgiref ]; nativeCheckInputs = [ pytestCheckHook @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = { description = "Extensions for using Django with htmx"; homepage = "https://github.com/adamchainz/django-htmx"; + changelog = "https://github.com/adamchainz/django-htmx/blob/${version}/docs/changelog.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ minijackson ]; }; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 9f531debca89..276d60fc3f93 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.3"; + version = "4.3.4"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc="; + hash = "sha256-o21xT+gu1vuar/QJbXhg2hpHkrBCVOMhGAFngi32d10="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 9a10d0bcf355..ac40a0b9ca9e 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -34,12 +34,15 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; - dependencies = [ - django-allauth - django-gravatar2 - mailmanclient - pytz - ]; + dependencies = + [ + django-allauth + django-gravatar2 + mailmanclient + pytz + ] + ++ django-allauth.optional-dependencies.openid + ++ django-allauth.optional-dependencies.socialaccount; nativeCheckInputs = [ django @@ -62,5 +65,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; + broken = lib.versionAtLeast django-allauth.version "65.0.0"; }; } diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index b01df9bd2b40..8c8d5e0bfc3a 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.11"; + version = "0.19.12"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; tag = "v${version}"; - hash = "sha256-J/D0rHhxJMpOSGu9LQ6tPKnjBZhqTX6I5YcSkx5+qXk="; + hash = "sha256-j5IKAjGes1EUNX9XE1RAPkGJGviABa4VFl789Mj2dyc="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 20f65e36f465..b6c3e021185c 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -1,37 +1,42 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, django, djangorestframework, + fetchFromGitHub, python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-taggit"; - version = "5.0.1"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7c19seDzXDBOCCovYx3awuFu9SlgKVJOt5KvdDDKtMw="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "django-taggit"; + tag = version; + hash = "sha256-QLJhO517VONuf+8rrpZ6SXMP/WWymOIKfd4eyviwCsU="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "taggit" ]; + buildInputs = [ django ]; nativeCheckInputs = [ djangorestframework ]; + pythonImportsCheck = [ "taggit" ]; + checkPhase = '' # prove we're running tests against installed package, not build dir rm -r taggit # Replace directory of locale - substituteInPlace ./tests/test_utils.py \ - --replace 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\"" + substituteInPlace tests/test_utils.py \ + --replace-fail 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\"" ${python.interpreter} -m django test --settings=tests.settings ''; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index dc91ad35fa03..378a1cb82fac 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.3.1"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - hash = "sha256-bEvTdTdEC8Q5Vk6/fWCF50xUEUhRlwc/UI69+jS8n64="; + hash = "sha256-zM7M4aDhpKJA+ugNpz5fwjBVurq7i2feiPpHzTaCIyA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index a41087b49d6e..f817d78437d4 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, aioquic, buildPythonPackage, @@ -56,16 +55,17 @@ buildPythonPackage rec { checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; - # don't run live tests - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NO_INTERNET = 1; - }; - disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" ]; + # disable network on all builds (including darwin) + # see https://github.com/NixOS/nixpkgs/issues/356803 + preCheck = '' + export NO_INTERNET=1 + ''; + pythonImportsCheck = [ "dns" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 4a0407e24d8b..9dc2e73c7c33 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.27.2"; + version = "0.28.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "tfranzel"; repo = "drf-spectacular"; tag = version; - hash = "sha256-lOgFDkAY+PqSeyLSvWFT7KPVicSJZxd6yl17GAGHbRs="; + hash = "sha256-+RXcCpsNAoGxK/taEf7+7QUDrHydvy5fIdBuEXi63DQ="; }; patches = [ @@ -52,6 +52,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail "'allauth.account'," "'allauth.account', 'allauth.socialaccount'," + ''; + build-system = [ setuptools ]; dependencies = [ @@ -81,14 +86,22 @@ buildPythonPackage rec { psycopg2 pytest-django pytestCheckHook - ]; + ] ++ django-allauth.optional-dependencies.socialaccount; disabledTests = [ # Test requires django with gdal "test_rest_framework_gis" # Outdated test artifact - "test_pydantic_decoration" + "test_callbacks" + # django-rest-knox is not packaged "test_knox_auth_token" + # slightly different error messages which get asserted + "test_model_choice_display_method_on_readonly" + ]; + + disabledTestPaths = [ + # Outdated test artifact + "tests/contrib/test_pydantic.py" ]; pythonImportsCheck = [ "drf_spectacular" ]; diff --git a/pkgs/development/python-modules/fastmri/default.nix b/pkgs/development/python-modules/fastmri/default.nix new file mode 100644 index 000000000000..abd6a219cc03 --- /dev/null +++ b/pkgs/development/python-modules/fastmri/default.nix @@ -0,0 +1,86 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build system + setuptools, + setuptools-scm, + + # dependencies + numpy, + scikit-image, + torchvision, + torch, + runstats, + pytorch-lightning, + h5py, + pyyaml, + torchmetrics, + pandas, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fastmri"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastMRI"; + tag = "v${version}"; + hash = "sha256-0IJV8OhY5kPWQwUYPKfmdI67TyYzDAPlwohdc0jWcV4="; + }; + + # banding_removal folder also has a subfolder named "fastmri" + # and np.product is substituted with np.prod in new numpy versions + postPatch = '' + substituteInPlace tests/test_math.py \ + --replace-fail "np.product" "np.prod" + substituteInPlace tests/conftest.py \ + --replace-fail "np.product" "np.prod" + + rm -rf banding_removal + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + scikit-image + torchvision + torch + runstats + pytorch-lightning + h5py + pyyaml + torchmetrics + pandas + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # much older version of pytorch-lightning is used + "tests/test_modules.py" + ]; + + pythonImportsCheck = [ "fastmri" ]; + + meta = { + description = "Pytorch-based MRI reconstruction tooling"; + homepage = "https://github.com/facebookresearch/fastMRI"; + changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ osbm ]; + }; +} diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix index f479665de92f..9c94ddbcebe3 100644 --- a/pkgs/development/python-modules/fedora-messaging/default.nix +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fedora-messaging"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "fedora-infra"; repo = "fedora-messaging"; tag = "v${version}"; - hash = "sha256-t5jwEgKLSB8APie+TD3WpgPYcAAPzEQLA+jXGlWVuNU="; + hash = "sha256-MBvFrOUrcPhsFR9yD7yqRM4Yf2StcNvL3sqFIn6XbMc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index a8ea25eec58c..934354dfbb18 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fireflyalgorithm"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,23 +19,28 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "FireflyAlgorithm"; tag = version; - hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE="; + hash = "sha256-NMmwjKtIk8KR0YXXSXkJhiQsbjMusaLnstUWx0izCNA="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy = "^1.26.1"' "" + ''; - propagatedBuildInputs = [ numpy ]; + build-system = [ poetry-core ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fireflyalgorithm" ]; - meta = with lib; { + meta = { description = "Implementation of the stochastic nature-inspired algorithm for optimization"; mainProgram = "firefly-algorithm"; homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ firefly-cpp ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ firefly-cpp ]; }; } diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix index bb49634b6034..1a3a35ac30c5 100644 --- a/pkgs/development/python-modules/flaxlib/default.nix +++ b/pkgs/development/python-modules/flaxlib/default.nix @@ -49,6 +49,13 @@ buildPythonPackage rec { pytestCheckHook ]; + env = { + # https://github.com/google/flax/issues/4491 + # Upstream should update Cargo.lock + # Enabling `PYO3_USE_ABI3_FORWARD_COMPATIBILITY` allows us to temporarily avoid the issue + PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true; + }; + # This package does not have tests (yet ?) doCheck = false; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 21a89983447e..8bb31468b749 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "fontparts"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d41ZVJOiCPITRjgGajBZh2JhnV345yPTCiTEGJzPoQ0="; + hash = "sha256-lmzLIqP1qFFqkVNzhFlo/C6kOmuddJ3U1eYLNN2h+d4="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix index f7cd8e7de47d..4267c7235127 100644 --- a/pkgs/development/python-modules/fontpens/default.nix +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -1,22 +1,26 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fonttools, + setuptools, }: buildPythonPackage rec { pname = "fontpens"; - version = "0.2.4"; + version = "0.3.0"; + pyproject = true; - src = fetchPypi { - pname = "fontPens"; - inherit version; - sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; - extension = "zip"; + src = fetchFromGitHub { + owner = "robotools"; + repo = pname; + tag = "v${version}"; + sha256 = "13msj0s7mg45klzbnd2w4f4ljb16bp9m0s872s6hczn0j7jmyz11"; }; - propagatedBuildInputs = [ fonttools ]; + build-system = [ setuptools ]; + + dependencies = [ fonttools ]; # can't run normal tests due to circular dependency with fontParts doCheck = false; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 9a4364a7436b..21f6885428bf 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.54.1"; + version = "4.55.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = "fonttools"; tag = version; - hash = "sha256-iYd3EiziaLR7zS0UQAje0QfShNfnhHPdH2+noCQ2yto="; + hash = "sha256:1y2sxzl9is3k1gmf9rvvxk9294dwbma1sh2ip56h7q1073346bv3"; }; build-system = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { (if isPyPy then brotlicffi else brotli) zopfli ]; - unicode = lib.optional (pythonOlder "3.11") unicodedata2; + unicode = lib.optional (pythonOlder "3.13") unicodedata2; graphite = [ lz4 ]; interpolatable = [ pycairo diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index 216e48dd1ff2..ab90f40faff4 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, - isPy27, + pythonOlder, fetchPypi, setuptools-scm, six, dnspython, + legacy-cgi, pycountry, pytestCheckHook, }: @@ -13,9 +14,9 @@ buildPythonPackage rec { pname = "formencode"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "FormEncode"; @@ -27,9 +28,12 @@ buildPythonPackage rec { sed -i '/setuptools_scm_git_archive/d' setup.py ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; + dependencies = [ + six + legacy-cgi + ]; nativeCheckInputs = [ dnspython @@ -43,10 +47,10 @@ buildPythonPackage rec { "test_unicode_ascii_subgroup" ]; - meta = with lib; { + meta = { description = "FormEncode validates and converts nested structures"; homepage = "http://formencode.org"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index e36d8412ee20..f67bb186ab6f 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + setuptools six appdirs pytz diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 95156b9b9d9a..7dd7b178fb43 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "gevent"; - version = "24.2.1"; + version = "24.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qy/Hb2gKz3zxiMLuD106tztjwfAxFMfNijTOu+WqIFY="; + hash = "sha256-i9FBkRTp5KPtM6W612av/5o892XLRApYKhs6m8gMGso="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index d187eb57b4d9..d3a615957f55 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.3.1"; + version = "2.3.3"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geventhttpclient"; @@ -26,7 +26,7 @@ buildPythonPackage rec { tag = version; # TODO: unvendor llhttp fetchSubmodules = true; - hash = "sha256-uOGnwPbvTam14SFTUT0UrwxHfP4a5cn3a7EhLoGBUrA="; + hash = "sha256-0ltTmF09EKs+55Mitfe5vxPjmCtnhla6q6SAvhyIQPk="; }; build-system = [ setuptools ]; @@ -48,10 +48,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - preCheck = '' - rm -rf geventhttpclient - ''; - pytestFlagsArray = [ "-m 'not network'" ]; pythonImportsCheck = [ "geventhttpclient" ]; @@ -59,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/geventhttpclient/geventhttpclient"; description = "High performance, concurrent HTTP client library using gevent"; - changelog = "https://github.com/geventhttpclient/geventhttpclient/releases/tag/${version}"; + changelog = "https://github.com/geventhttpclient/geventhttpclient/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 7de7ccc12cec..a485d3015f6d 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.49.0"; + version = "3.50.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; tag = version; - hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0="; + hash = "sha256-gjctcpaV9L8x4ubS4Ox6kyNG7/kl7tZt9c9/7SWVXkg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 7d5785eb90bd..2b4170463262 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.8.2"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; tag = version; - hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw="; + hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 5809fc684420..beb94dd7eb25 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -24,11 +24,12 @@ rich, tomlkit, gradio, + safehttpx, }: buildPythonPackage rec { pname = "gradio-client"; - version = "1.4.0"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,9 +39,9 @@ buildPythonPackage rec { owner = "gradio-app"; repo = "gradio"; # not to be confused with @gradio/client@${version} - rev = "refs/tags/gradio_client@${version}"; + tag = "gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk="; + hash = "sha256-u4GQYtCeAMDqRRbZGtjfqIHwuHyxUpw6kRE75SJMALg="; }; prePatch = '' cd client/python @@ -75,6 +76,7 @@ buildPythonPackage rec { pydub rich tomlkit + safehttpx gradio.sans-reverse-dependencies ]; # ensuring we don't propagate this intermediate build diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 05b8098aa639..cdc4ccbece6f 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -3,6 +3,8 @@ stdenv, buildPythonPackage, fetchPypi, + fetchFromGitHub, + fetchpatch, pythonOlder, writeShellScriptBin, gradio, @@ -12,6 +14,11 @@ hatch-requirements-txt, hatch-fancy-pypi-readme, + # web assets + zip, + nodejs, + pnpm_9, + # runtime setuptools, aiofiles, @@ -35,6 +42,7 @@ python-multipart, pydub, pyyaml, + safehttpx, semantic-version, typing-extensions, uvicorn, @@ -64,23 +72,27 @@ buildPythonPackage rec { pname = "gradio"; - version = "5.1.0"; + version = "5.11.0"; pyproject = true; disabled = pythonOlder "3.7"; - # We use the Pypi release, since it provides prebuilt webui assets - src = fetchPypi { - inherit pname version; - hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM="; + # unfortunately no fetchPypi due to https://github.com/gradio-app/gradio/pull/9778 + src = fetchFromGitHub { + owner = "gradio-app"; + repo = "gradio"; + tag = "gradio@${version}"; + hash = "sha256-HW0J7oSkCo4DIHpU4LUoBZ2jmmrv5Xd64floA4uyo5A="; }; + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version src; + hash = "sha256-9fAkP2zV3OfyROdtvmS94ujpkGmlB0wGOaWS13LgJTM="; + }; + # fix packaging.ParserSyntaxError, which can't handle comments postPatch = '' sed -i -e "s/ #.*$//g" requirements*.txt - - # they bundle deps? - rm -rf venv/ ''; pythonRelaxDeps = [ @@ -96,6 +108,12 @@ buildPythonPackage rec { "ruff" ]; + nativeBuildInputs = [ + zip + nodejs + pnpm_9.configHook + ]; + build-system = [ hatchling hatch-requirements-txt @@ -125,6 +143,7 @@ buildPythonPackage rec { python-multipart pydub pyyaml + safehttpx semantic-version typing-extensions uvicorn @@ -158,6 +177,16 @@ buildPythonPackage rec { (writeShellScriptBin "npm" "false") ] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email; + preBuild = '' + pnpm build + pnpm package + ''; + + postBuild = '' + # SyntaxError: 'await' outside function + zip -d dist/gradio-*.whl gradio/_frontend_code/lite/examples/transformers_basic/run.py + ''; + # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. preCheck = @@ -193,12 +222,29 @@ buildPythonPackage rec { # fails without network "test_download_if_url_correct_parse" + "test_encode_url_to_base64_doesnt_encode_errors" # flaky: OSError: Cannot find empty port in range: 7860-7959 "test_docs_url" "test_orjson_serialization" "test_dataset_is_updated" "test_multimodal_api" + "test_examples_keep_all_suffixes" + "test_progress_bar" + "test_progress_bar_track_tqdm" + "test_info_and_warning_alerts" + "test_info_isolation[True]" + "test_info_isolation[False]" + "test_examples_no_cache_optional_inputs" + "test_start_server[127.0.0.1]" + "test_start_server[[::1]]" + "test_single_request" + "test_all_status_messages" + "test_default_concurrency_limits[not_set-statuses0]" + "test_default_concurrency_limits[None-statuses1]" + "test_default_concurrency_limits[1-statuses2]" + "test_default_concurrency_limits[2-statuses3]" + "test_concurrency_limits" # tests if pip and other tools are installed "test_get_executable_path" @@ -256,6 +302,7 @@ buildPythonPackage rec { disabledTestPaths = [ # 100% touches network "test/test_networking.py" + "client/python/test/test_client.py" # makes pytest freeze 50% of the time "test/test_interfaces.py" @@ -289,6 +336,13 @@ buildPythonPackage rec { doInstallCheck = false; doCheck = false; preCheck = ""; + postInstall = '' + shopt -s globstar + for f in $out/**/*.py; do + cp $f "$f"i + done + shopt -u globstar + ''; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 03463b006e6d..419c62ea4cf4 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "poetry_core>=1,<2" "poetry-core" \ --replace-fail ', "setuptools>=59,<70"' "" ''; diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index a358ab4fe914..1d53dc62587d 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "poetry_core>=1,<2" "poetry-core" \ --replace ', "setuptools>=59,<70"' "" ''; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 524e77f9ea72..76f2cfd98b6e 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; tag = version; - hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k="; + hash = "sha256-SyyyNBhJVVKAzPl288B7E2PoqNd9Pp9VmSJASYez6Gs="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix index 65ec22fb04aa..ef4bc09a352e 100644 --- a/pkgs/development/python-modules/harlequin-postgres/default.nix +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "harlequin-postgres"; - version = "0.4.0"; + version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "harlequin_postgres"; inherit version; - hash = "sha256-1y8S3z6ZTt+PZg75aB/bKnEPdAtqjZ2IqyBtUBk8IFA="; + hash = "sha256-1/tALkY5wz9lOWc2QsZkEa/qx0DxjKIiVfXTfOu4wQE="; }; build-system = [ diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 19daf7262e18..00b147ab0e19 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,17 +21,16 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.26.1"; - format = "pyproject"; - disabled = pythonOlder "3.8"; + version = "1.27.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jZVlkubF1d8fWRvh6XqUHHuexv0Dn0yGJMKVV7rANOk="; + hash = "sha256-lxwpbZgZq7OBERL8UsepdRyNOBiY82Uzuxb5eR6UH9Y="; }; # listed in backend/pyproject.toml - propagatedBuildInputs = [ + dependencies = [ editables packaging pathspec @@ -55,7 +54,7 @@ buildPythonPackage rec { ]; preCheck = '' - export HOME=$TMPDIR + export HOME=$(mktemp -d) ''; checkPhase = '' @@ -64,13 +63,13 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Modern, extensible Python build backend"; mainProgram = "hatchling"; homepage = "https://hatch.pypa.io/latest/"; changelog = "https://github.com/pypa/hatch/releases/tag/hatchling-v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ofek ]; diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index 584858a36bd3..769045aa104f 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -32,6 +32,7 @@ parameterized, pip-tools, pkg-config, + pkgconfig, prompt-toolkit, protobuf, psutil, @@ -106,6 +107,7 @@ stdenv.mkDerivation rec { zap-chip # gdbus-codegen glib + pkgconfig python # dependencies of build scripts click @@ -194,6 +196,7 @@ stdenv.mkDerivation rec { packaging parameterized pip-tools + pkgconfig prompt-toolkit protobuf psutil @@ -224,26 +227,18 @@ stdenv.mkDerivation rec { wheel yapf ]; - depListToAttrs = - list: - builtins.listToAttrs ( - map (dep: { - name = dep.name; - value = dep; - }) (lib.filter (x: x != null) list) - ); - saturateDependencies = - deps: - let - before = deps; - new = lib.mergeAttrsList ( - map (dep: depListToAttrs (dep.propagatedBuildInputs or [ ])) (lib.attrValues before) - ); - after = before // new; - in - if lib.attrNames before != lib.attrNames after then saturateDependencies after else before; - saturateDependencyList = list: lib.attrValues (saturateDependencies (depListToAttrs list)); - saturatedDependencyList = lib.filter (drv: drv ? dist) (saturateDependencyList dependencies); + filterNull = list: lib.filter (dep: dep != null) list; + toItem = dep: { + inherit dep; + key = dep.name; + }; + saturatedDependencies = lib.genericClosure { + startSet = map toItem (filterNull dependencies); + operator = item: map toItem (filterNull ((item.dep).propagatedBuildInputs or [ ])); + }; + saturatedDependencyList = lib.filter (dep: dep ? dist && dep != null) ( + map (item: item.dep) saturatedDependencies + ); in lib.concatMapStringsSep " " (dep: "file://${dep.dist}") saturatedDependencyList; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index a8cf00e51e60..cdf4f8dfa04d 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "htmldate"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "adbar"; repo = "htmldate"; tag = "v${version}"; - hash = "sha256-VjOqttpbHp1wQARyHieAZie/yO74+S2mDbBXx00PKWM="; + hash = "sha256-lTBLk8SlS2R4n5HORyt5mechKKEWRtMggOxUZ6kgQIc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 2ac0cb8e381a..26c134aa5e30 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -3,10 +3,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - exceptiongroup, + aioquic, h11, h2, + httpx, priority, + trio, + uvloop, wsproto, poetry-core, pytest-asyncio, @@ -16,16 +19,16 @@ buildPythonPackage rec { pname = "hypercorn"; - version = "0.16.0"; - format = "pyproject"; + version = "0.17.3"; + pyproject = true; disabled = pythonOlder "3.11"; # missing taskgroup dependency src = fetchFromGitHub { owner = "pgjones"; repo = "Hypercorn"; - rev = version; - hash = "sha256-pIUZCQmC3c6FiV0iMMwJGs9TMi6B/YM+vaSx//sAmKE="; + tag = version; + hash = "sha256-AtSMURz1rOr6VTQ7L2EQ4XZeKVEGTPXTbs3u7IhnZo8"; }; postPatch = '' @@ -35,27 +38,31 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - exceptiongroup h11 h2 priority wsproto ]; + optional-dependencies = { + h3 = [ aioquic ]; + trio = [ trio ]; + uvloop = [ uvloop ]; + }; + nativeCheckInputs = [ + httpx pytest-asyncio pytest-trio pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = [ - # https://github.com/pgjones/hypercorn/issues/217 - "test_startup_failure" - ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "hypercorn" ]; meta = with lib; { + changelog = "https://github.com/pgjones/hypercorn/blob/${src.tag}/CHANGELOG.rst"; homepage = "https://github.com/pgjones/hypercorn"; description = "ASGI web server inspired by Gunicorn"; mainProgram = "hypercorn"; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index efada0d391d0..e5a1bc9e443f 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -77,6 +77,8 @@ buildPythonPackage rec { # racy, fails to find a file sometimes "test_recreate_charmap" "test_uses_cached_charmap" + # fails if builder is too slow + "test_can_run_with_no_db" ] ++ lib.optionals (pythonOlder "3.10") [ # not sure why these tests fail with only 3.9 diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 5cb46020ff4b..3b5477200b69 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "hylang"; repo = "hyrule"; tag = version; - hash = "sha256-w1Q2w/P1bDt/F1+zTkUFi5PxycXXE3p0qadfBcyWElg="; + hash = "sha256-FJ7iu+ohbe4nhADka2OC+JHAmwZkkJgFVLyHD0Fms1E="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library for the Hy programming language"; homepage = "https://github.com/hylang/hyrule"; - changelog = "https://github.com/hylang/hylure/releases/tag/${version}"; + changelog = "https://github.com/hylang/hyrule/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 37b9fd69df5a..a89c1d4c5271 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.22.0"; + version = "3.22.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; tag = "v${version}"; - hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0="; + hash = "sha256-wXffw+/esHvWxrNdlnYLTPflgOaRyIdf0hxI4M12Xdc="; }; pythonRelaxDeps = [ "requests" ]; diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 32e4972e1add..76252ba97269 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -2,19 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, pytestCheckHook, poetry-core, - httplib2, icalendar, + pook, python-dateutil, pytz, + urllib3, }: buildPythonPackage rec { pname = "icalevents"; - version = "0.1.29"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,36 +23,25 @@ buildPythonPackage rec { owner = "jazzband"; repo = "icalevents"; tag = "v${version}"; - hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; + hash = "sha256-xIio+zJtIa0mM7aHFHm1QW36hww82h4A1YWaWUCxx14="; }; - patches = [ - (fetchpatch2 { - name = "icalendar-v6-compat.patch"; - url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch"; - hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ - httplib2 icalendar python-dateutil pytz + urllib3 ]; - pythonRelaxDeps = [ - "httplib2" - "icalendar" - "pytz" + nativeCheckInputs = [ + pook + pytestCheckHook ]; - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ # Makes HTTP calls "test_events_url" diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index ae013099ba75..542cb22f335a 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -23,8 +23,7 @@ buildPythonPackage { pname = "inkex"; inherit (inkscape) version; - - format = "pyproject"; + pyproject = true; inherit (inkscape) src; @@ -38,16 +37,19 @@ buildPythonPackage { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + dependencies = [ cssselect lxml numpy + pillow pygobject3 + pyparsing pyserial + scour tinycss2 ]; @@ -60,10 +62,6 @@ buildPythonPackage { checkInputs = [ gtk3 - packaging - pillow - pyparsing - scour ]; disabledTests = diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index e48cdcc0e861..8a5517cd705a 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -2,32 +2,32 @@ lib, buildPythonPackage, fetchPypi, - unittestCheckHook, - six, + setuptools, + setuptools-scm, + pytestCheckHook, }: buildPythonPackage rec { pname = "isodate"; - version = "0.6.1"; - format = "setuptools"; + version = "0.7.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "SMWIHefosKDWSMsCTIBi3ITnuEDtgehkx2FP08Envek="; + hash = "sha256-TNGqD0PKdvSmxsApKoX0CzXsLkPjFbWfBubTIXGpU+Y="; }; - propagatedBuildInputs = [ six ]; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ - "-s" - "src/isodate/tests" + build-system = [ + setuptools + setuptools-scm ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { + changelog = "https://github.com/gweis/isodate/blob/${version}/CHANGES.txt"; description = "ISO 8601 date/time parser"; - homepage = "http://cheeseshop.python.org/pypi/isodate"; + homepage = "https://github.com/gweis/isodate/"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index a7b5e7027267..5bfe04b9e574 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -13,6 +13,7 @@ setuptools, testtools, pytest-mock, + nixosTests, }: buildPythonPackage rec { @@ -46,6 +47,8 @@ buildPythonPackage rec { pytest-mock ]; + passthru.tests = { inherit (nixosTests) jenkins; }; + meta = { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; mainProgram = "jenkins-jobs"; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 995f436a8242..d9c5c674eb9e 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -21,19 +21,29 @@ buildPythonPackage rec { pname = "jinja2"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Sjruesu+cwOu3o6WSNE7i/iKQpKCqmEiqZPwrIAMs2k="; + hash = "sha256-j+//jcMDTie7gNZ8Zx64qbxCTA70wIJu2/8wTM7/Q7s="; }; - nativeBuildInputs = [ flit-core ]; + postPatch = '' + # Do not test with trio, it increases jinja2's dependency closure by a lot + # and everyone consuming these dependencies cannot rely on sphinxHook, + # because sphinx itself depends on jinja2. + substituteInPlace tests/test_async{,_filters}.py \ + --replace-fail "import trio" "" \ + --replace-fail ", trio.run" "" \ + --replace-fail ", \"trio\"" "" + ''; - propagatedBuildInputs = [ markupsafe ]; + build-system = [ flit-core ]; + + dependencies = [ markupsafe ]; optional-dependencies = { i18n = [ babel ]; @@ -45,14 +55,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; - disabledTests = lib.optionals (pythonAtLeast "3.13") [ - # https://github.com/pallets/jinja/issues/1900 - "test_custom_async_iteratable_filter" - "test_first" - "test_loop_errors" - "test_package_zip_list" - ]; - passthru.doc = stdenv.mkDerivation { # Forge look and feel of multi-output derivation as best as we can. # diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 0cd4182d4241..7b5154d905e9 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests "test_nested_parallel_warnings" # tests is flaky under load + "test_memory" # tests - and the module itself - assume strictatime mount for build directory ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. diff --git a/pkgs/development/python-modules/kde-material-you-colors/default.nix b/pkgs/development/python-modules/kde-material-you-colors/default.nix index b760e52c2a0d..d8c2d8b14329 100644 --- a/pkgs/development/python-modules/kde-material-you-colors/default.nix +++ b/pkgs/development/python-modules/kde-material-you-colors/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "kde-material-you-colors"; - version = "1.9.3"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "kde-material-you-colors"; tag = "v${version}"; - hash = "sha256-hew+aWbfWmqTsxsNx/0Ow0WZAVl0e6OyzDxcKm+nlzQ="; + hash = "sha256-qT2F3OtRzYagbBH/4kijuy4udD6Ak74WacIhfzaNWqo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index da58622e2684..25b8f96c80d6 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XUqQlekXc6dWXUwVlZSuMOynkv1fm4ne1FnXEUhKlss="; + hash = "sha256-tMJYkLt1BQ1UwIEj0nMxVreKWaJVX1Rh9psORM2RJC8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index af3621b4e18b..6abcf4ed9cae 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,14 +32,13 @@ buildPythonPackage rec { owner = "Instagram"; repo = "LibCST"; tag = "v${version}"; - hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA="; + hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit pname version src; sourceRoot = "${src.name}/${cargoRoot}"; - name = "${pname}-${version}"; - hash = "sha256-TcWGW1RF2se89BtvQHO+4BwnRMZ8ygqO3du9Q/gZi/Q="; + hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI="; }; cargoRoot = "native"; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index f137ecb2aa81..533367d32d46 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-cZm6siQKnMMwdAAD+ndkj0P25TPaQRqCUKSnBYT5EVM="; + hash = "sha256-/AO9M4odoEt2B6RNgqYrPrF42ArwWlNlPoAdb4u2ffc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llm-cmd/default.nix b/pkgs/development/python-modules/llm-cmd/default.nix index e4f9335dd1d2..e9a71c8cfed7 100644 --- a/pkgs/development/python-modules/llm-cmd/default.nix +++ b/pkgs/development/python-modules/llm-cmd/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportCheck = [ + pythonImportsCheck = [ "llm_cmd" ]; diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix index 23760ce6f9d9..fc6ffa59fdbf 100644 --- a/pkgs/development/python-modules/llm-ollama/default.nix +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "test_registered_models_when_ollama_is_down" ]; - pythonImportCheck = [ + pythonImportsCheck = [ "llm_ollama" ]; diff --git a/pkgs/development/python-modules/lrclibapi/default.nix b/pkgs/development/python-modules/lrclibapi/default.nix new file mode 100644 index 000000000000..f9866514548a --- /dev/null +++ b/pkgs/development/python-modules/lrclibapi/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + requests, + vcrpy, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "lrclibapi"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dr-Blank"; + repo = "lrclibapi"; + tag = "v${version}"; + hash = "sha256-K5wO3BexftnWe48loaW8TjySQvh2X+X3GSmG5qg+BGc="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "lrclib" + ]; + + nativeCheckInputs = [ + pytestCheckHook + vcrpy + ]; + + meta = { + homepage = "https://github.com/Dr-Blank/lrclibapi"; + changelog = "https://github.com/Dr-Blank/lrclibapi/releases/tag/v${version}"; + description = "Python wrapper for downloading synced lyrics from the lrclib.net api"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index b45bec563437..3738f5fb2588 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -1,44 +1,39 @@ { - lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, beautifulsoup4, + buildPythonPackage, comicon, feedparser, + fetchFromGitHub, filetype, + lib, lxml, natsort, nix-update-script, pillow, + poetry-core, + pyside6, python-slugify, requests, typer, - pyside6, }: buildPythonPackage rec { pname = "mandown"; - version = "1.10.1"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; tag = "v${version}"; - hash = "sha256-6i0a2jEJy7aL6W801Xki7jmHhO5kkFL8rJI+y+MhWVo="; + hash = "sha256-xoRUGtZMM1l3gCtF1wFHBo3vTEGJcNxqkO/yeTuEke8="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pillow" - "typer" - ]; - - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 comicon feedparser @@ -51,18 +46,24 @@ buildPythonPackage rec { typer ]; + pythonRelaxDeps = [ + "pillow" + "typer" + ]; + optional-dependencies = { gui = [ pyside6 ]; - updateScript = nix-update-script { }; }; pythonImportsCheck = [ "mandown" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}"; description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter"; homepage = "https://github.com/potatoeggy/mandown"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ae7e59177af8..c91d0dcc95e0 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "1.1.0"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "marshmallow_sqlalchemy"; inherit version; - hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg="; + hash = "sha256-Xd9YPddf31qzHfdph82iupGUKZa6XVd+ktZ0j6k6X1I="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index e1b2588f07fc..dd31fc453656 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,6 +1,6 @@ mesonPythonBuildFlagsHook() { # Add all of mesonFlags to -Csetup-args for pypa builds - for f in $mesonFlags; do + for f in $mesonFlags "${mesonFlagsArray[@]}"; do appendToVar pypaBuildFlags "-Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html appendToVar pipBuildFlags "--config-settings=setup-args=$f" diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 0b48312c4aa1..50515bae3118 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "autorefs"; tag = version; - hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g="; + hash = "sha256-EfZcY5eZtRKjxWC4/sWF3F4N/uK2e3gFK2dBY/kTCM4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch new file mode 100644 index 000000000000..c196d2bb5035 --- /dev/null +++ b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch @@ -0,0 +1,109 @@ +From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 6 Jan 2025 20:41:27 +0800 +Subject: [PATCH] fix(test): replace np.float_ to np.float64 + +--- + mlxtend/_base/_regressor.py | 2 +- + mlxtend/_base/tests/test_classifier.py | 2 +- + mlxtend/_base/tests/test_cluster.py | 2 +- + mlxtend/classifier/multilayerperceptron.py | 2 +- + mlxtend/classifier/softmax_regression.py | 2 +- + mlxtend/math/linalg.py | 2 +- + mlxtend/plotting/tests/test_decision_regions.py | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py +index e3d0a1d..1d3a5d6 100644 +--- a/mlxtend/_base/_regressor.py ++++ b/mlxtend/_base/_regressor.py +@@ -16,7 +16,7 @@ class _Regressor(object): + pass + + def _check_target_array(self, y, allowed=None): +- if not isinstance(y[0], (float, np.float_)): ++ if not isinstance(y[0], (float, np.float64)): + raise AttributeError("y must be a float array.\nFound %s" % y.dtype) + + def fit(self, X, y, init_params=True): +diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py +index f77f74d..1bbac6d 100644 +--- a/mlxtend/_base/tests/test_classifier.py ++++ b/mlxtend/_base/tests/test_classifier.py +@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): + + + def test_check_labels_integer_notok(): +- y = np.array([1.0, 2.0], dtype=np.float_) ++ y = np.array([1.0, 2.0], dtype=np.float64) + cl = BlankClassifier(print_progress=0, random_seed=1) + with pytest.raises(AttributeError) as excinfo: + cl._check_target_array(y) +diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py +index 6da1a9d..54c2526 100644 +--- a/mlxtend/_base/tests/test_cluster.py ++++ b/mlxtend/_base/tests/test_cluster.py +@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): + + + def test_check_labels_integer_notok(): +- y = np.array([1.0, 2.0], dtype=np.float_) ++ y = np.array([1.0, 2.0], dtype=np.float64) + cl = BlankClassifier(print_progress=0, random_seed=1) + with pytest.raises(AttributeError) as excinfo: + cl._check_target_array(y) +diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py +index 770dab9..05416c3 100644 +--- a/mlxtend/classifier/multilayerperceptron.py ++++ b/mlxtend/classifier/multilayerperceptron.py +@@ -143,7 +143,7 @@ class MultiLayerPerceptron( + prev_grad_b_out = np.zeros(shape=self.b_["out"].shape) + prev_grad_w_out = np.zeros(shape=self.w_["out"].shape) + +- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) ++ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) + + self.init_time_ = time() + +diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py +index 56444e5..173154e 100644 +--- a/mlxtend/classifier/softmax_regression.py ++++ b/mlxtend/classifier/softmax_regression.py +@@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass): + ) + self.cost_ = [] + +- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) ++ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) + + self.init_time_ = time() + rgen = np.random.RandomState(self.random_seed) +diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py +index 02600f1..ece4c3c 100644 +--- a/mlxtend/math/linalg.py ++++ b/mlxtend/math/linalg.py +@@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13): # method='gram-schmidt', + # 2c) Normalize if linearly independent, + # and set to zero otherwise + +- arr = ary.astype(np.float_).copy() ++ arr = ary.astype(np.float64).copy() + + for i in range(arr.shape[1]): + for j in range(i): +diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py +index fba2255..aad63ff 100644 +--- a/mlxtend/plotting/tests/test_decision_regions.py ++++ b/mlxtend/plotting/tests/test_decision_regions.py +@@ -94,7 +94,7 @@ def test_y_int_ary(): + "Try passing the array as y.astype(np.int_)", + plot_decision_regions, + X[:, :2], +- y.astype(np.float_), ++ y.astype(np.float64), + sr, + ) + +-- +2.47.0 + diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 361aea5cb9bf..1ee22516471f 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -7,6 +7,7 @@ pytestCheckHook, scipy, numpy, + numpy_1, scikit-learn, pandas, matplotlib, @@ -22,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; - repo = pname; + repo = "mlxtend"; tag = "v${version}"; hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo="; }; @@ -38,10 +39,22 @@ buildPythonPackage rec { joblib ]; + patches = [ + # https://github.com/rasbt/mlxtend/pull/1119 + ./0001-fix-test-replace-np.float_-to-np.float64.patch + ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "-sv" ]; + disabledTests = [ + # Type changed in numpy2 test should be updated + "test_invalid_labels_1" + "test_default" + "test_nullability" + ]; + disabledTestPaths = [ "mlxtend/evaluate/f_test.py" # need clean "mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index f87fed067d73..5ab5711dc8e3 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; tag = version; - hash = "sha256-oXUdYTvpvaML1YsqK7HudQV/RvUx6N0K/xYuiNp8uos="; + hash = "sha256-pElSwzNbZlZT8imK1UsLy2TyvS8TEM7hsVqLxEK1tbg="; }; build-system = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 60eddaf3ba6a..8ac8f71ecbdf 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.20"; + version = "5.0.22"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JLExnMZvgfQIF6V6yAYCpfGGJmm91iHw2Wq5iaZXglU="; + hash = "sha256-2vR7ih9fGQzT6qQAGKZD845UIneQDPHbfyUs7b/tmY8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 65421615d17e..02bfc83bca24 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.4"; + version = "4.1.1.116.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-9yg02AQdHMR/Yz0dpjSb3umdNRNTo7S04Q2BY/vu7WQ="; + hash = "sha256-4ALRG0yKCRwztQ9A6fMVaht6c8tDrMSh+CfsLRZbdcw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix new file mode 100644 index 000000000000..040807fde8cd --- /dev/null +++ b/pkgs/development/python-modules/mpl-typst/default.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + matplotlib, + numpy, + pytestCheckHook, + pillow, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "mpl-typst"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "daskol"; + repo = "mpl-typst"; + tag = "v${version}"; + hash = "sha256-Pm5z4tkpgwjYtpBh9+AJWlsHl7HNGxyftfaNSwQDpdk="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + matplotlib + ]; + + nativeCheckInputs = [ + pytestCheckHook + pillow + numpy + ]; + + pythonImportsCheck = [ + "mpl_typst" + "mpl_typst.as_default" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Typst backend for matplotlib"; + homepage = "https://github.com/daskol/mpl-typst"; + changelog = "https://github.com/daskol/mpl-typst/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + }; +} diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix index e7fbccced448..a8bf7e2beb41 100644 --- a/pkgs/development/python-modules/music-assistant-client/default.nix +++ b/pkgs/development/python-modules/music-assistant-client/default.nix @@ -25,8 +25,15 @@ buildPythonPackage rec { hash = "sha256-QE2PQeXCAq7+iMomCZK+UmrPUApJxwKi/pzCaLJVS/4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0" "${version}" + ''; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "music-assistant-models" ]; + dependencies = [ aiohttp music-assistant-models diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index 1831f5e163c2..edd4c041095e 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "music-assistant-models"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; - tag = "v${version}"; - hash = "sha256-FbnwUfAwCwwBKqEUtb2ZBxHehFwJdr9YkuWKox018BY="; + tag = version; + hash = "sha256-keig18o32X53q/QcoaPO0o9AT4XTEZ+dQ3L6u6BVkLU="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Models used by Music Assistant (shared by client and server"; homepage = "https://github.com/music-assistant/models"; - changelog = "https://github.com/music-assistant/models/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/music-assistant/models/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c70ce08f1362..8ff080528044 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -390,8 +390,8 @@ rec { "sha256-UkuWWk99OTXMMhYMuAby9rbJjlhYBI0WwA9clnz4U9A="; mypy-boto3-detective = - buildMypyBoto3Package "detective" "1.36.0" - "sha256-qumyLsWuOFuwiBK1XN558ag8LlEA5jfHofy5dKK+Gbw="; + buildMypyBoto3Package "detective" "1.36.2" + "sha256-91C7CVfMmGvvfm4GdnDuWzSXi1sDsL5qj8YLC17loiI="; mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.36.0" @@ -446,8 +446,8 @@ rec { "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.36.0" - "sha256-/dFXF0dKEF0wPQoh04dY9X0x8JqaxgFLtOYJocBwshA="; + buildMypyBoto3Package "ec2" "1.36.2" + "sha256-IwQg73lI34QtCjedW3ctRC0tzNAOXvgJl2s09GV6Zg0="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.36.0" @@ -462,8 +462,8 @@ rec { "sha256-ezh5me1scgEEH0I/19CSVDstsLkwYgdVhwPuVivbKWk="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.36.0" - "sha256-uO/y0aDNH4aayyvRDFH/WedHTku0A8QRvrzCe34P6gY="; + buildMypyBoto3Package "ecs" "1.36.1" + "sha256-bpE0iwtVksX2ByM7DSV+Y81ev8Ml896Wc9FciZEmjdA="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.36.0" @@ -1174,8 +1174,8 @@ rec { "sha256-oLFs4pHfXJbG5cenQi83ur7ZaMfPLYzqp4AvvAadg+k="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.36.0" - "sha256-FogxXsF3rVx33QF9Mo6RJhjsbgrEVLR037Js+SIYczI="; + buildMypyBoto3Package "sagemaker" "1.36.2" + "sha256-M4H/GVm8hLISSyKR6VtpUzTBOtRiaIr5DY5ZkM9mhk4="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.36.0" diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 9acbfe21acc5..780a3ce968dd 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.13.0"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; tag = "v${version}"; - hash = "sha256-P2Ozmj7/7QBmjlveHLsNdYgUAerg0qOoa8pO0iQc5os="; + hash = "sha256-Ha7icLFc4BL7a3NECcwX4dtWmkXctANCqu/IbrEnmjw="; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix index c6cbdd69a33a..f6780ba38981 100644 --- a/pkgs/development/python-modules/nbmake/default.nix +++ b/pkgs/development/python-modules/nbmake/default.nix @@ -1,40 +1,36 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - poetry-core, - setuptools, - wheel, + + # build-system + hatchling, + + # dependencies ipykernel, nbclient, nbformat, pygments, - pytest, - pyyaml, - pytest-xdist, + + # tests pytestCheckHook, typing-extensions, }: buildPythonPackage rec { pname = "nbmake"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "treebeardtech"; repo = "nbmake"; tag = "v${version}"; - hash = "sha256-OzjqpipFb5COhqc//Sg6OU65ShPrYe/KtxifToEXveg="; + hash = "sha256-Du2sxSl1a5ZVl7ueHWnkTTPtuMUlmALuOuSkoEFIQcE="; }; build-system = [ - poetry-core - setuptools - wheel + hatchling ]; dependencies = [ @@ -42,20 +38,13 @@ buildPythonPackage rec { nbclient nbformat pygments - pytest - pyyaml ]; pythonRelaxDeps = [ "nbclient" ]; pythonImportsCheck = [ "nbmake" ]; - # tests are prone to race conditions under high parallelism - # https://github.com/treebeardtech/nbmake/issues/129 - pytestFlagsArray = [ "--maxprocesses=4" ]; - nativeCheckInputs = [ - pytest-xdist pytestCheckHook typing-extensions ]; @@ -64,12 +53,19 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + disabledTests = [ + # depends on pytest-xdist that is not added, as + # tests are prone to race conditions under parallelism, they sometimes hang indefinitely + # https://github.com/treebeardtech/nbmake/issues/129 + "test_when_parallel_passing_nbs_then_ok" + ]; + __darwinAllowLocalNetworking = true; meta = { description = "Pytest plugin for testing notebooks"; homepage = "https://github.com/treebeardtech/nbmake"; - changelog = "https://github.com/treebeardtech/nbmake/releases/tag/v${version}"; + changelog = "https://github.com/treebeardtech/nbmake/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix index de537ae3fdc2..cb3e55c503f6 100644 --- a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix +++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix @@ -2,8 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + attrs, + django, + netaddr, netbox, + setuptools, }: buildPythonPackage rec { pname = "netbox-interface-synchronization"; @@ -19,6 +22,12 @@ buildPythonPackage rec { build-system = [ setuptools ]; + dependencies = [ + attrs + django + netaddr + ]; + # netbox is required for the pythonImportsCheck; plugin does not provide unit tests nativeCheckInputs = [ netbox ]; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 0f96ca82471d..721038c0be29 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.3.12"; + version = "0.3.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; tag = version; - hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; + hash = "sha256-nDgGX5KbthOBXX5jg99fGT28ZuBx0Hxb+aHak3Uvjoc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 11edc89909b7..068497e585ee 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "24.1.0"; + version = "24.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QOOc3A/oADnjOtxgLqArwXIikwNDApVY4yHAYt9ENRU="; + hash = "sha256-U2lWxYDuA+PpMEMgjanq/JILWTTH5+DEx9dZ/KCWNjM="; }; build-system = [ diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index fad35559c9ed..5d7216286564 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -124,11 +124,6 @@ buildPythonPackage rec { export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; - # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python - postConfigure = '' - concatTo mesonFlags mesonFlagsArray - ''; - preBuild = '' ln -s ${cfg} site.cfg ''; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index eb672a053f25..90f1fc68e3c0 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -101,11 +101,6 @@ buildPythonPackage rec { export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; - # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python - postConfigure = '' - concatTo mesonFlags mesonFlagsArray - ''; - buildInputs = [ blas lapack diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index dc0aa827b99b..34db90917e06 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -7,19 +7,22 @@ opencensus, psutil, requests, + setuptools, }: buildPythonPackage rec { pname = "opencensus-ext-azure"; - version = "1.1.13"; - format = "setuptools"; + version = "1.1.14"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rsMEchdwBTebpWpwKgl9YYxfV1WOG7ZnbsdflIEwaSo="; + hash = "sha256-ycbrrVQq62GBMyLmJ9WImlY+e4xOAkv1hGnQbbc6sUg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-core azure-identity opencensus diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 2469de129b32..f05df1c82144 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -19,7 +19,6 @@ python-dateutil, pytz, xxhash, - python, # for passthru.tests falcon, @@ -49,8 +48,6 @@ buildPythonPackage rec { hash = "sha256-HlvsV3Bsxa4Ud1+RrEnDWKX82DRyfgBS7GvK9827/wE="; }; - maturinBuildFlags = [ "--interpreter ${python.executable}" ]; - nativeBuildInputs = [ cffi ] ++ (with rustPlatform; [ diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix new file mode 100644 index 000000000000..31e05dfc9e0f --- /dev/null +++ b/pkgs/development/python-modules/pandera/default.nix @@ -0,0 +1,132 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + multimethod, + numpy, + packaging, + pandas, + pydantic, + typeguard, + typing-inspect, + wrapt, + # test + joblib, + pyarrow, + pytestCheckHook, + pytest-asyncio, + # optional dependencies + black, + dask, + fastapi, + geopandas, + hypothesis, + pandas-stubs, + polars, + pyyaml, + scipy, + shapely, +}: + +buildPythonPackage rec { + pname = "pandera"; + version = "0.20.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "unionai-oss"; + repo = "pandera"; + tag = "v${version}"; + hash = "sha256-VetLfZlBWok7Mr1jxlHHjDH/D5xEsPFWQtX/hrvobgQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + multimethod + numpy + packaging + pandas + pydantic + typeguard + typing-inspect + wrapt + ]; + + optional-dependencies = + let + dask-dataframe = [ dask ] ++ dask.optional-dependencies.dataframe; + extras = { + strategies = [ hypothesis ]; + hypotheses = [ scipy ]; + io = [ + pyyaml + black + #frictionless # not in nixpkgs + ]; + # pyspark expression does not define optional-dependencies.connect: + #pyspark = [ pyspark ] ++ pyspark.optional-dependencies.connect; + # modin not in nixpkgs: + #modin = [ + # modin + # ray + #] ++ dask-dataframe; + #modin-ray = [ + # modin + # ray + #]; + #modin-dask = [ + # modin + #] ++ dask-dataframe; + dask = dask-dataframe; + mypy = [ pandas-stubs ]; + fastapi = [ fastapi ]; + geopandas = [ + geopandas + shapely + ]; + polars = [ polars ]; + }; + in + extras // { all = lib.concatLists (lib.attrValues extras); }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + joblib + pyarrow + ] ++ optional-dependencies.all; + + disabledTestPaths = [ + "tests/fastapi/test_app.py" # tries to access network + "tests/core/test_docs_setting_column_widths.py" # tests doc generation, requires sphinx + "tests/modin" # requires modin, not in nixpkgs + "tests/mypy/test_static_type_checking.py" # some typing failures + "tests/pyspark" # requires spark + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # OOM error on ofborg: + "test_engine_geometry_coerce_crs" + # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry + "test_schema_dtype_crs_with_coerce" + ]; + + pythonImportsCheck = [ + "pandera" + "pandera.api" + "pandera.config" + "pandera.dtypes" + "pandera.engines" + ]; + + meta = { + description = "Light-weight, flexible, and expressive statistical data testing library"; + homepage = "https://pandera.readthedocs.io"; + changelog = "https://github.com/unionai-oss/pandera/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 944dbabbe2ee..4384c6ad2f27 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "pillow"; - version = "11.0.0"; + version = "11.1.0"; pyproject = true; src = fetchFromGitHub { owner = "python-pillow"; repo = "pillow"; tag = version; - hash = "sha256-vWNqzA2ZfJcWexXw790RgyYtP8WDtahoQIX16otCRnk="; + hash = "sha256-9tcukZIJMheVNBfpppjUcuhvRal7J59iQWgBqkEgJDk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plyara/default.nix b/pkgs/development/python-modules/plyara/default.nix index 03cd72c2dfe8..ee5c87c9611f 100644 --- a/pkgs/development/python-modules/plyara/default.nix +++ b/pkgs/development/python-modules/plyara/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plyara"; - version = "2.2.2"; + version = "2.2.6"; pyproject = true; disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+" src = fetchPypi { inherit pname version; - hash = "sha256-AIxXtu9Ic0N8I29w2h/sP5EdWsscmWza9WkhVyvlSs0="; + hash = "sha256-228fhwJTEV1kpIxbDzG+CgJOHJjWifl5SYteCY8Pd3Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 62dfdcb3918c..8f66d7fe70dc 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -6,55 +6,64 @@ pythonOlder, build, git, + pytest-cov-stub, pytest-mock, pytestCheckHook, setuptools, tomli-w, + trove-classifiers, virtualenv, }: buildPythonPackage rec { pname = "poetry-core"; - version = "1.9.1"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8="; + hash = "sha256-3dmvFn2rxtR0SK8oiEHIVJhpJpX4Mm/6kZnIYNSDv90="; }; nativeCheckInputs = [ build git pytest-mock + pytest-cov-stub pytestCheckHook setuptools tomli-w + trove-classifiers virtualenv ]; - # Requires git history to work correctly disabledTests = [ + # Requires git history to work correctly "default_with_excluded_data" "default_src_with_excluded_data" + "test_package_with_include" + # Distribution timestamp mismatches, as we operate on 1980-01-02 + "test_sdist_mtime_zero" + "test_sdist_members_mtime_default" + "test_dist_info_date_time_default_value" ]; pythonImportsCheck = [ "poetry.core" ]; - # Allow for package to use pep420's native namespaces + # Allow for packages to use PEP420's native namespace pythonNamespaces = [ "poetry" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; meta = with lib; { changelog = "https://github.com/python-poetry/poetry-core/blob/${src.rev}/CHANGELOG.md"; - description = "Core utilities for Poetry"; + description = "Poetry PEP 517 Build Backend"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; - maintainers = [ ]; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 66de9b48e848..bbc43eecbcd8 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.29.1"; + version = "5.29.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aDvgLKIab/6A223QLAtbKJIyLFnKV/1shy1lLLgFScs="; + hash = "sha256-ssyOi7fJMmmW8OFgE3sIYfGoIWJQJljfKVEgnQywMJ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index ee79e250e1d7..0292027a607b 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, CoreFoundation, fetchPypi, + setuptools, IOKit, pytestCheckHook, python, @@ -12,8 +13,8 @@ buildPythonPackage rec { pname = "psutil"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.1"; + pyproject = true; inherit stdenv; @@ -21,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-j6rk8xC22Wn6JsoFRTOLIfc8axXbfEqNk0pUgvqoGPI="; + hash = "sha256-z4SWcowY8tC0UZjwaJW+UvNmEXEXRrfzDEZLQitQ4vU="; }; postPatch = '' @@ -32,6 +33,8 @@ buildPythonPackage rec { --replace-fail kIOMainPortDefault kIOMasterPortDefault ''; + build-system = [ setuptools ]; + buildInputs = # workaround for https://github.com/NixOS/nixpkgs/issues/146760 lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ CoreFoundation ] diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c7749f437f91..fa097d9cc7d0 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250111"; + version = "1.0.2.20250117"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ul/bjvMgjBzNVyWV4o11CzMD6LT55+baTzITVt8H7wc="; + hash = "sha256-7jkUrZDmx9umNrUlzzXDdJWsDtfHKg/u8dfDNtVgiCU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 228b89890f96..1ab82189326f 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.13.1"; + version = "4.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w="; + hash = "sha256-g7MkfeCD3/r6w79A9NFFVzLxbiXOMQX9CbVawPDRLoM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index a6018280d6fb..307552130b14 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.8"; + version = "0.10.9.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-evqA2+QFmFEYEZ7EfdXaldsqfW42f79d7lvZSYMtC3U="; + hash = "sha256-9pTK0Z76W9He5PPlJw60BmE8l0OUA15b/E7Bq6hwuHk="; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index d77b60248132..efb769051def 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonAtLeast "3.11") [ # Tests are using lib2to3 "pyannotate_tools/fixes/tests/test_annotate*.py" + "pyannotate_tools/annotations/tests/dundermain_test.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index d5cbf75a5c69..1c1933537a00 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -26,27 +26,6 @@ let pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; - - # clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11. - # libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6, - # but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a - # support for C++17 aligned allocations on macOS. - # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. - stdenv' = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - python.stdenv.override (oldStdenv: { - buildPlatform = oldStdenv.buildPlatform // { - darwinMinVersion = "10.13"; - }; - targetPlatform = oldStdenv.targetPlatform // { - darwinMinVersion = "10.13"; - }; - hostPlatform = oldStdenv.hostPlatform // { - darwinMinVersion = "10.13"; - }; - }) - else - python.stdenv; in buildPythonPackage rec { pname = "pybind11"; @@ -69,8 +48,6 @@ buildPythonPackage rec { buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedNativeBuildInputs = [ setupHook ]; - stdenv = stdenv'; - dontUseCmakeBuildDir = true; # Don't build tests if not needed, read the doInstallCheck value at runtime diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index d8a29fa08fb7..438fe2ee5bfc 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.15"; + version = "2.2.16"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; tag = version; - hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY="; + hash = "sha256-w617mOxvL1alj7jauH4TVsYO0wxMHIFjevdhb4+542s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index c8640cec9d75..121f69d3803d 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pycron"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "kipe"; repo = "pycron"; tag = version; - hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs="; + hash = "sha256-WnaQfS3VzF9fZHX9eNRjih/U7SgWeWVynLdwPZgF950="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 8dd0fb09c740..a258462bf77a 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchPypi, @@ -18,6 +19,12 @@ buildPythonPackage rec { hash = "sha256-1JGQheqgfaErrejuch57v3reAVHKD4KUaibI9LmM3Os="; }; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + # fails testExemplarSet2 test due to sjd locale not having an auxiliary + # esType. icuReal doesn't have an sjd locale + ./skip-sjd-local.diff + ]; + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyicu/skip-sjd-local.diff b/pkgs/development/python-modules/pyicu/skip-sjd-local.diff new file mode 100644 index 000000000000..995b0d5f57dc --- /dev/null +++ b/pkgs/development/python-modules/pyicu/skip-sjd-local.diff @@ -0,0 +1,13 @@ +diff --git a/test/test_LocaleData.py b/test/test_LocaleData.py +index 76410e7..7db6f13 100644 +--- a/test/test_LocaleData.py ++++ b/test/test_LocaleData.py +@@ -126,6 +126,7 @@ class TestLocaleData(TestCase): + ld = LocaleData(locale) + scriptCodes = Script.getCode(locale) + exemplarSets = [] ++ if locale == 'sjd': continue + for k in range(2): # for casing option in (normal, uncased) + # it seems USET_CASE_INSENSITIVE = 2 + option = 0 if k == 0 else 2 + diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 3f587808a0e9..e662589d9621 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.3.1"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; tag = "v${version}"; - hash = "sha256-cnMYHHtIRxIySfZV0jTn+OFji+72cOReyNNDiJ9pbAg="; + hash = "sha256-ldeosRAjh60aB5db/ojtttvevhpKQa3wk7u8MpTq13Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 626f444db883..b73c6bd05998 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -41,7 +41,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.24.14"; + version = "1.25.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-M7Ca3nqnqeClp4MGJqTAVGZhAGRniregjRrjtAhRkBc="; + hash = "sha256-kdu8CuQJ5+h8+PS66acWEfcttgALiD+JBoWWyGtjBzs="; }; # swig is not wrapped as Python package @@ -123,6 +123,11 @@ buildPythonPackage rec { preCheck = '' export PATH="$out/bin:$PATH"; + + # Fixes at least one test; see: + # * + # * + export PYMUPDF_SYSINSTALL_TEST=1 ''; meta = { diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index fc4f14046019..a410c3345cde 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { hash = "sha256-5SPVeBL1oMZ/XXgKch2Hbk6BRU24HlVl4oXZ2agF1h8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'repository =' 'Repository =' + ''; + nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 7f8e0575e96f..8186c89b7b27 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -18,14 +18,14 @@ in buildPythonPackage rec { pname = "pyscard"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; tag = version; - hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; + hash = "sha256-RXCz6Npb/MrykHxtUsYlghCPeTwjDC6s9258iLA7OKs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 100ed9fa27ae..24f5f6eaff5a 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; tag = "v${version}"; - hash = "sha256-lXOREy0BABcjpAkxIMy245SAX8HfJKj/QSHGob14GgI="; + hash = "sha256-GWytFRMDFwTeglBm90fd09HICkAwpkcpmVar1x3vsro="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 2baa1ec2071a..a1c1c61fa108 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; tag = "v${version}"; - hash = "sha256-whAvUgjPdZ0ePt0LkREJxJnLacNyQDWupdAinK3kJww="; + hash = "sha256-VKDyXTvh0T/MKqsZo9lAlHyfhtiXzP5P+d0DSiLqS1o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index ecdd45dc5800..0b99073fa5ab 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.18"; + version = "0.11.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; tag = "v${version}"; - hash = "sha256-AbGmDDJUBvGwZixNKY+iLTKUENSAXHOAdztmbIQIEKs="; + hash = "sha256-Zji0idW4HkZjbZgbfABJ2W145y19a6no4t4oZUvi0Qs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysuezv2/default.nix b/pkgs/development/python-modules/pysuezv2/default.nix index 4f50b7519533..9f24a7765b47 100644 --- a/pkgs/development/python-modules/pysuezv2/default.nix +++ b/pkgs/development/python-modules/pysuezv2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysuezv2"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jb101010-2"; repo = "pySuez"; tag = version; - hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4="; + hash = "sha256-D/XsJL393fDIKMB1Wyzods5hLsdU3Qgq8T5aTJ3SLrM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 7d6537386687..335e53e31548 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.37"; + version = "3.3.38"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-InDbfWzRb+Q+E6feeatHIliq83g83oUfo3Yze/BAJdM="; + hash = "sha256-o3onR27lKg2QAa1Tgdidv6iOzqb/XlkJPq+vkkIhnAY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh index 0eff690e9079..88ccd0aac171 100644 --- a/pkgs/development/python-modules/pytest-forked/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -12,21 +12,7 @@ pytestForkedHook() { fi } -# the flags should be added before pytestCheckHook runs so -# until we have dependency mechanism in generic builder, we need to use this ugly hack. - if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then - _preDistPhases="${preDistPhases[*]} " - _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" - if [[ -n "${__structuredAttrs-}" ]]; then - preDistPhases=() - else - preDistPhases="" - fi - appendToVar preDistPhases $_preDistPhases - unset _preDistPhases - else - appendToVar preDistPhases pytestForkedHook - fi + # The flags should be added before pytestCheckHook runs in preDistPhases. + postInstallCheckHooks+=(pytestForkedHook) fi diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 751532baa6aa..dbd2d5b20171 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "14.0"; + version = "15.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-SkALy808ekrRUauK+sEj2Q7KOr4n+Ycl3E2XAoh9LpI="; + hash = "sha256-LZrHuvWfTBOscwtH9vqA51XRugWB2kXOMLcvs1QrRHQ="; }; build-system = [ setuptools ]; @@ -29,15 +29,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/pytest-dev/pytest-rerunfailures/issues/267 - "test_run_session_teardown_once_after_reruns" - "test_exception_matches_rerun_except_query" - "test_exception_not_match_rerun_except_query" - "test_exception_matches_only_rerun_query" - "test_exception_match_only_rerun_in_dual_query" - ]; - meta = with lib; { description = "Pytest plugin to re-run tests to eliminate flaky failures"; homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 9819e0d3ec7d..8600ce998acc 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -4,21 +4,7 @@ pytestXdistHook() { ) } -# the flags should be added before pytestCheckHook runs so -# until we have dependency mechanism in generic builder, we need to use this ugly hack. - if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then - _preDistPhases="${preDistPhases[*]} " - _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" - if [[ -n "${__structuredAttrs-}" ]]; then - preDistPhases=() - else - preDistPhases="" - fi - appendToVar preDistPhases $_preDistPhases - unset _preDistPhases - else - appendToVar preDistPhases pytestXdistHook - fi + # The flags should be added before pytestCheckHook runs in preDistPhases. + preInstallCheckHooks+=(pytestXdistHook) fi diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 8955938a3bc5..0d596f09f9a2 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.34.0"; + version = "0.34.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; tag = version; - hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E="; + hash = "sha256-ffmyTVeQKzV/sssxFuIckmBW6wmjnTWkHbVQ1v7fmGg="; }; pythonRelaxDeps = [ "boto3" ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index f88ba57d9331..8448b656ce1d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.11.1"; + version = "4.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; tag = "v${version}"; - hash = "sha256-6gSpnBXznpWDtGEdV6PDtQvRodAz4jqOY+zGT2+NUj0="; + hash = "sha256-3yCT9u3Bz5QPaDtPe1Ezio+O+wWjQ+4pLh55sYAfnNc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 77a960e88958..532a45a4c360 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc="; + hash = "sha256-8v21+ylhXHfCdD4cs9kxQ1Om6HsQw30jjZGuHG/q4IY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 41b0ed328669..e62f2e2ffa97 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, pythonOlder, # build-system @@ -127,9 +128,14 @@ buildPythonPackage rec { "test_jedi_completion_with_fuzzy_enabled" ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; + preCheck = + '' + export HOME=$(mktemp -d); + '' + # https://github.com/python-lsp/python-lsp-server/issues/605 + + lib.optionalString (pythonAtLeast "3.13") '' + substituteInPlace test/conftest.py --replace-fail logging.DEBUG logging.INFO + ''; pythonImportsCheck = [ "pylsp" diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index c312fe60eefd..ac723db320d5 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +23,12 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-otbr-api"; tag = version; - hash = "sha256-RMj4NdEbMIxh2PDzbhUWgmcdzRXY8RxcQNN/bbGOW5Q="; + hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp bitstruct cryptography diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 5588b7b5ea14..c41977d9df07 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyviz-comms"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; src = fetchPypi { pname = "pyviz_comms"; inherit version; - hash = "sha256-/eSgF8IhPs7mOppnQUMchF5CpcexWI5Ke6LkNwxYNyg="; + hash = "sha256-1w4XVV9yYsSISmt7ycoZy4FlB6AyozTZy0EbRUbK/0w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index e47570dd9b06..6f7ecf6b10b6 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -63,6 +63,11 @@ buildPythonPackage rec { rm -r zmq ''; + pytestFlagsArray = [ + "-m" + "'not flaky'" + ]; + disabledTests = [ # Tests hang "test_socket" diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 71cfa490452b..36a258c0ff59 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -4,37 +4,50 @@ lib, fetchPypi, poetry-core, + ipykernel, networkx, numpy, + packaging, pint, pydantic, pytestCheckHook, pythonOlder, + scipy, }: buildPythonPackage rec { pname = "qcelemental"; - version = "0.28.0"; - + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2pb924jBcB+BKyU2mmoWnTXy1URsN8YuhgSMsPGxaKI="; + hash = "sha256-v2NO5lLn2V6QbikZiVEyJCM7HXBcJq/qyG5FHzFrPAQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - networkx + dependencies = [ numpy + packaging pint pydantic ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + viz = [ + # TODO: nglview + ipykernel + ]; + align = [ + networkx + scipy + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "qcelemental" ]; diff --git a/pkgs/development/python-modules/re-assert/default.nix b/pkgs/development/python-modules/re-assert/default.nix index 5dc156b15053..497908e994c2 100644 --- a/pkgs/development/python-modules/re-assert/default.nix +++ b/pkgs/development/python-modules/re-assert/default.nix @@ -1,23 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, regex, + pytestCheckHook, }: buildPythonPackage rec { - pname = "re_assert"; + pname = "re-assert"; version = "1.1.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "5172dfbd2047a15dff2347735dea7e495479cc7e58841199a4a4973256b20464"; + src = fetchFromGitHub { + owner = "asottile"; + repo = "re-assert"; + tag = "v${version}"; + hash = "sha256-UTXFTD3QOKIzjq05J9Ontv5h9aClOwlPYKFXfDnBWuc="; }; - # No tests in archive - doCheck = false; + build-system = [ setuptools ]; - propagatedBuildInputs = [ regex ]; + dependencies = [ regex ]; + + pythonImportsCheck = [ "re_assert" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Show where your regex match assertion failed"; diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 1ef521441ed6..c720d2bdc455 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "reflex-chakra"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex-chakra"; tag = "v${version}"; - hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs="; + hash = "sha256-Smkpcy6jPYTUWskZwWKkL9V545Ji/riQ8RFjJXm44qM="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 58b3b2f8034f..3889396c5d9f 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.20.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; tag = "v${version}"; - hash = "sha256-Fy+K0fM+vjZp8u7C0ElFa1xQM/CIMqFALe42gZRBNOs="; + hash = "sha256-14vkLX7wKi+AYv2wPeHJ7MhKBKp+GB3oHWqxiPdkQhs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 109dbdc33c43..6cd96914765b 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.9"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; tag = version; - hash = "sha256-yUn7tDAu4DJZFJAMdsSnEjlvCHxp1y7OO8xR86lus54="; + hash = "sha256-rIIXTrP340lWMjQcT+/JKULwvaWC2gjrWSzu+3tqnK0="; }; patches = [ diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 618499682282..b13c8e6ce301 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.1.1"; + version = "7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,10 +19,10 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; tag = "v${version}"; - hash = "sha256-AJMJb8FN+KynxJXI7s7PwyM/+UpXCtWTcRK/fhCg+io="; + hash = "sha256-G+mmSeTLr6h0e2YCJOpbYaRNZ5M6PXWBYXdn9xGitkM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ jsonschema ]; @@ -30,11 +30,11 @@ buildPythonPackage rec { ${python.interpreter} utest/run.py ''; - meta = with lib; { + meta = { changelog = "https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-${version}.rst"; description = "Generic test automation framework"; homepage = "https://robotframework.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ bjornfor ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 3fab182d75f3..27ac5a2c32c2 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -5,6 +5,7 @@ pytoolconfig, pytest-timeout, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools, }: @@ -34,11 +35,18 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - "test_search_submodule" - "test_get_package_source_pytest" - "test_get_modname_folder" - ]; + disabledTests = + [ + "test_search_submodule" + "test_get_package_source_pytest" + "test_get_modname_folder" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/python-rope/rope/issues/801 + "test_skipping_directories_not_accessible_because_of_permission_error" + "test_hint_parametrized_iterable" + "test_hint_parametrized_iterator" + ]; meta = with lib; { description = "Python refactoring library"; diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index de6c7a29141f..2626b10ff5ad 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -5,7 +5,6 @@ cargo, fetchPypi, pytestCheckHook, - pythonOlder, rustc, rustPlatform, libiconv, @@ -13,21 +12,19 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.20.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.22.3"; + pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-1yohCCT6z9r4dozy18oloELDAyCzAg3i+gRkCSDU4SE="; + hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-5vbR2EbrAPJ8pb78tj/+r9nOWgQDT5aO/LUQI4kAGjU="; + hash = "sha256-m01OB4CqDowlTAiDQx6tJ7SeP3t+EtS9UZ7Jad6Ccvc="; }; nativeBuildInputs = [ @@ -44,8 +41,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "rpds" ]; meta = with lib; { - description = "Python bindings to Rust's persistent data structures (rpds"; - homepage = "https://pypi.org/project/rpds-py/"; + changelog = "https://github.com/crate-py/rpds/releases/tag/v${version}"; + description = "Python bindings to Rust's persistent data structures"; + homepage = "https://github.com/crate-py/rpds"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/safehttpx/default.nix b/pkgs/development/python-modules/safehttpx/default.nix new file mode 100644 index 000000000000..d7a9fd27b514 --- /dev/null +++ b/pkgs/development/python-modules/safehttpx/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + httpx, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "safehttpx"; + version = "0.1.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s1a/yCzuOiTDlblKLb6rvtYK/xql+jtf6XxPJFbrzkI="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + httpx + ]; + + pythonImportsCheck = [ "safehttpx" ]; + + doCheck = false; # require network access + + meta = { + description = "SSRF-safe wrapper around httpx"; + homepage = "https://github.com/gradio-app/safehttpx"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fliegendewurst ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 2b5057e47e0d..901d94e374fa 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "scikit-bio"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; tag = version; - hash = "sha256-1L3AemXVqfgBDlRZorG7+8qt3f1Bm8L+Se+OwqEWwI4="; + hash = "sha256-yZa9Kl7+Rk4FLQkZIxa9UIsIGAo6YI4UAiJYbhhPIaI="; }; build-system = [ diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index dc5b0433fa52..c596ec3b40c6 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, buildPythonPackage, selenium-manager, + setuptools, certifi, pytestCheckHook, pythonOlder, @@ -19,8 +20,8 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.25.0"; - format = "setuptools"; + version = "4.27.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,8 +29,8 @@ buildPythonPackage rec { owner = "SeleniumHQ"; repo = "selenium"; # check if there is a newer tag with or without -python suffix - tag = "selenium-${version}"; - hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY="; + tag = "selenium-${version}-python"; + hash = "sha256-XpTfZCERA2SmLOj6dcERVJ47K0gFhdXMTl9VCeE6eD8="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; @@ -58,7 +59,9 @@ buildPythonPackage rec { ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/ ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ certifi trio trio-websocket diff --git a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch index 51db7aaf0e19..4654e00b4919 100644 --- a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch +++ b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch @@ -1,37 +1,55 @@ -From e52d75248a5d18bcf965591eb240a11a23147634 Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Sat, 3 Aug 2024 22:38:49 +0300 -Subject: [PATCH] Don't build the Selenium Manager. - ---- - py/setup.py | 7 ------- - 1 file changed, 7 deletions(-) - +diff --git a/py/pyproject.toml b/py/pyproject.toml +index e99a03cd5d..1061adbdf5 100644 +--- a/py/pyproject.toml ++++ b/py/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools", "setuptools-rust"] ++requires = ["setuptools"] + build-backend = "setuptools.build_meta" + + [project] diff --git a/py/setup.py b/py/setup.py -index a71007f..fdda74e 100755 +deleted file mode 100755 +index 0f93e33f0e..0000000000 --- a/py/setup.py -+++ b/py/setup.py -@@ -19,7 +19,6 @@ from distutils.command.install import INSTALL_SCHEMES - from os.path import dirname, join, abspath - from setuptools import setup - from setuptools.command.install import install ++++ /dev/null +@@ -1,38 +0,0 @@ +-# Licensed to the Software Freedom Conservancy (SFC) under one +-# or more contributor license agreements. See the NOTICE file +-# distributed with this work for additional information +-# regarding copyright ownership. The SFC licenses this file +-# to you under the Apache License, Version 2.0 (the +-# "License"); you may not use this file except in compliance +-# with the License. You may obtain a copy of the License at +-# +-# http://www.apache.org/licenses/LICENSE-2.0 +-# +-# Unless required by applicable law or agreed to in writing, +-# software distributed under the License is distributed on an +-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-# KIND, either express or implied. See the License for the +-# specific language governing permissions and limitations +-# under the License. +- +-from distutils.command.install import INSTALL_SCHEMES +-from os.path import dirname, join, abspath +-from setuptools import setup +-from setuptools.command.install import install -from setuptools_rust import Binding, RustExtension - - - for scheme in INSTALL_SCHEMES.values(): -@@ -84,12 +83,6 @@ setup_args = { - "typing_extensions~=4.9", - "websocket-client~=1.8", - ], +- +- +-for scheme in INSTALL_SCHEMES.values(): +- scheme['data'] = scheme['purelib'] +- +-setup_args = { +- 'cmdclass': {'install': install}, - 'rust_extensions': [ - RustExtension( - {"selenium-manager": "selenium.webdriver.common.selenium-manager"}, - binding=Binding.Exec - ) - ], - 'zip_safe': False - } - --- -2.45.2 - +-} +- +-setup(**setup_args) diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index f620568e1fa1..565655c5678c 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -12,11 +12,12 @@ pyasn1-modules, pytestCheckHook, pythonOlder, + pyopenssl, }: buildPythonPackage rec { pname = "service-identity"; - version = "24.1.0"; + version = "24.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "pyca"; repo = pname; tag = version; - hash = "sha256-ibi9hls/VnVePv4fF2CyxI22P1RX6QpCwyeENWVPkx4="; + hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; }; nativeBuildInputs = [ @@ -42,6 +43,8 @@ buildPythonPackage rec { pyasn1-modules ]; + checkInputs = [ pyopenssl ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "service_identity" ]; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 8857565f461b..8b65a9f1eb4c 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -8,33 +8,29 @@ pip, pytestCheckHook, pythonOlder, - setuptools-scm, + setuptools, six, - wheel, }: buildPythonPackage rec { pname = "setupmeta"; - version = "3.6.0"; - format = "setuptools"; + version = "3.6.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "codrsquad"; - repo = pname; + repo = "setupmeta"; tag = "v${version}"; - hash = "sha256-OI7PU5LQ6w0iAbK7nsP+6RizsEWjKP9nec2J6n0xUhI="; + hash = "sha256-L8RDfcAa2Zhr6huFt0AmNt0Qzea2xNtCX1BIULsiQgA="; }; preBuild = '' export PYGRADLE_PROJECT_VERSION=${version}; ''; - nativeBuildInputs = [ - setuptools-scm - wheel - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ git diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 2173f63bdcfe..fb69ff6313f8 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -11,30 +11,29 @@ pythonOlder, setuptools, toml, - wheel, + tomli, }: buildPythonPackage rec { pname = "setuptools-git-versioning"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; tag = "v${version}"; - hash = "sha256-xugK/JOVA53nCK8bB0gPkhIREmy0+/OthsydfYRCYno="; + hash = "sha256-Slf6tq83LajdTnr98SuCiFIdm/6auzftnARLAOBgyng="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools - ] ++ lib.optionals (pythonOlder "3.11") [ toml ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; pythonImportsCheck = [ "setuptools_git_versioning" ]; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 3e139d4714a8..76b9b7ef2994 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -7,11 +7,14 @@ numpy, scikit-learn, scipy, + setuptools, tabulate, torch, tqdm, flaky, + llvmPackages, pandas, + pytest-cov-stub, pytestCheckHook, safetensors, pythonAtLeast, @@ -19,39 +22,38 @@ buildPythonPackage rec { pname = "skorch"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; + hash = "sha256-AguMhI/MO4DNexe5azVEXOw7laTRBN0ecFW81qqh0rY="; }; - disabled = pythonOlder "3.8"; + # AttributeError: 'NoneType' object has no attribute 'span' with Python 3.13 + # https://github.com/skorch-dev/skorch/issues/1080 + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scikit-learn scipy tabulate - torch + torch # implicit dependency tqdm ]; nativeCheckInputs = [ flaky pandas + pytest-cov-stub pytestCheckHook safetensors ]; - # patch out pytest-cov dep/invocation - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=skorch" "" \ - --replace "--cov-report=term-missing" "" \ - --replace "--cov-config .coveragerc" "" - ''; + checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; disabledTests = [ @@ -63,11 +65,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" - ] - ++ lib.optionals (pythonAtLeast "3.11") [ - # Python 3.11+ not yet supported for torch.compile - # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377 - "test_fit_and_predict_with_compile" ]; disabledTestPaths = @@ -83,11 +80,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "skorch" ]; - meta = with lib; { + meta = { description = "Scikit-learn compatible neural net library using Pytorch"; homepage = "https://skorch.readthedocs.io"; changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 930af0fdc277..b7fddfd9e782 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; tag = version; - hash = "sha256-kKkAdQymmgJ9V+73nYi4MhOSJvrO2jwJ2BUYhUGPHe0="; + hash = "sha256-e08hhO7CTH6V+8ZUhte36GD0fL7XvuW/CgIuARU3c6E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 49550048e359..1ff4abf9a06d 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.2.5"; + version = "6.2.6"; pyproject = true; src = fetchFromGitHub { owner = "softlayer"; repo = "softlayer-python"; tag = "v${version}"; - hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY="; + hash = "sha256-qBhnHFFlP4pqlN/SETXEqYyre/ap60wHe9eCfyiB+kA="; }; build-system = [ diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 6c6e5b76eeaf..c09040d2beaa 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.15.4"; + version = "0.15.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1LHFfST/D2Ty/VtalbSbf7hO0geibX1Yzidk3MXHK4Q="; + hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index 4947d86ce0bb..d02867e3189a 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.15.2"; - format = "pyproject"; + version = "0.16.2"; + pyproject = true; outputs = [ "out" @@ -29,11 +29,12 @@ buildPythonPackage rec { owner = "felix-hilden"; repo = "sphinx-codeautolink"; tag = "v${version}"; - hash = "sha256-h1lteF5a3ga1VlhXCz2biydli3sg3ktPbz0O5n0eeFI="; + hash = "sha256-pHo7uA7TXmNdSU8CFRO0heI5rYBw+JeQ2NijmirhhHk="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools sphinxHook sphinx-rtd-theme matplotlib @@ -42,7 +43,7 @@ buildPythonPackage rec { sphinxRoot = "docs/src"; - propagatedBuildInputs = [ + dependencies = [ sphinx beautifulsoup4 ]; @@ -54,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension that makes code examples clickable"; homepage = "https://github.com/felix-hilden/sphinx-codeautolink"; + changelog = "https://github.com/felix-hilden/sphinx-codeautolink/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 77452fbccde6..501486e5059b 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -42,11 +42,20 @@ buildPythonPackage rec { i18n = [ sqlalchemy-i18n ]; }; - nativeCheckInputs = [ - psycopg2 - pymysql - pytestCheckHook - ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeCheckInputs = + [ + psycopg2 + pymysql + pytestCheckHook + ] + ++ optional-dependencies.flask + ++ optional-dependencies.flask-login + ++ optional-dependencies.flask-sqlalchemy; + + disabledTestPaths = [ + # requires sqlalchemy-i18n, which is incompatible with sqlalchemy>=2 + "tests/test_i18n.py" + ]; preCheck = '' # Indicate tests that we don't have a database server at hand diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index b3540712d926..172e1f352658 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -2,33 +2,54 @@ lib, fetchPypi, buildPythonPackage, + setuptools, sqlalchemy, sqlalchemy-utils, six, + postgresql, + postgresqlTestHook, + psycopg2, + pytestCheckHook, }: buildPythonPackage rec { pname = "sqlalchemy-i18n"; version = "1.1.0"; + pyproject = true; src = fetchPypi { pname = "SQLAlchemy-i18n"; inherit version; - sha256 = "de33376483a581ca14218d8f57a114466c5f72b674a95839b6c4564a6e67796f"; + hash = "sha256-3jM3ZIOlgcoUIY2PV6EURmxfcrZ0qVg5tsRWSm5neW8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ sqlalchemy sqlalchemy-utils six ]; - # tests require running a postgresql server - doCheck = false; + pythonImportsCheck = [ "sqlalchemy_i18n" ]; - meta = with lib; { + nativeCheckInputs = [ + postgresql + postgresqlTestHook + psycopg2 + pytestCheckHook + ]; + + env = { + PGDATABASE = "sqlalchemy_i18n_test"; + postgresqlEnableTCP = 1; + }; + + meta = { homepage = "https://github.com/kvesteri/sqlalchemy-i18n"; description = "Internationalization extension for SQLAlchemy models"; - license = licenses.bsd3; + license = lib.licenses.bsd3; + # sqlalchemy.exc.InvalidRequestError: The 'sqlalchemy.orm.mapper()' function is removed as of SQLAlchemy 2.0. + broken = lib.versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index cf91ac2872c4..5286d78f7cd3 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { openssl ]; - pythonImportChecks = [ + pythonImportsCheck = [ "sqlcipher3" ]; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 18b2a0c43983..29f50e5b4d92 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-u2tN9GVlXvMyVI4k8I4gWvyBuauGyxxFZXp/8XOjoA4="; + hash = "sha256-njezXhbRzGUqJUXwmXwd6yPqKPofPu/mCe7jBjw7EF8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index b9450b505f78..05a541623d7c 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; tag = "v${version}"; - hash = "sha256-1GtkT3GqEBu1I9zZb5u3wIm5ygYe/unhn2cXvhnPkQc="; + hash = "sha256-rKm4MUheQOJyaBggiZQ3U9J2kzOXrUcWpJnfPr4HzyU="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 57ab8522e78a..bdae89164f45 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1304"; + version = "3.0.1305"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-51tRvvavAYGa6XTyB6bL9a7TOZsv6DvVrFgrma5aJq8="; + hash = "sha256-uvGhUwiG3AsKpJrm6vYuhzv7rn9Sq1564IXY4fCa8H8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 1bddf639b4c7..d091eb08f57d 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/sirfz/tesserocr"; license = licenses.mit; maintainers = with maintainers; [ mtrsk ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index dcd27bffb2bc..956846ba82f1 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -12,17 +12,17 @@ }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.6"; + version = "0.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-X6U34T1sM4P+JFpOfcI7CmULcGZ4SCXwP2fFHKi1cWE="; + hash = "sha256-3I5Xi9vmyAlUNKBmmTuGnetaiiVzL3sEEy31npRZlFU="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ requests python-dateutil mpegdash @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tidalapi" ]; meta = { - changelog = "https://github.com/tamland/python-tidal/releases/tag/v${version}"; + changelog = "https://github.com/tamland/python-tidal/blob/v${version}/HISTORY.rst"; description = "Unofficial Python API for TIDAL music streaming service"; homepage = "https://github.com/tamland/python-tidal"; license = lib.licenses.gpl3; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 81d9c74792be..92039063cb8e 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -4,7 +4,6 @@ fetchurl, buildPythonPackage, fetchFromGitHub, - python, # nativeBuildInputs cargo, @@ -92,7 +91,6 @@ buildPythonPackage rec { }; sourceRoot = "${src.name}/bindings/python"; - maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ cargo diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index f222f9dba2a0..aea469d1523f 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, fetchPypi, pythonOlder, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "traits"; version = "6.4.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -17,15 +19,22 @@ buildPythonPackage rec { hash = "sha256-qbv9ngwIt94H6G72TmnLlqKcIQWkO/gyzYsWL6HiL0Q="; }; - # Circular dependency - doCheck = false; + patches = [ + (fetchpatch2 { + url = "https://github.com/enthought/traits/commit/a20f2154b2c79eb8550ea9228d1a4415ff51b72a.patch"; + hash = "sha256-ycStcpxlvmobL3ZXaSbGrXAzk/Tkjs3BJ67lnwZpeVA="; + excludes = [ ".github/*" ]; + }) + ]; + + build-system = [ setuptools ]; pythonImportsCheck = [ "traits" ]; - meta = with lib; { + meta = { description = "Explicitly typed attributes for Python"; homepage = "https://pypi.python.org/pypi/traits"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/development/python-modules/trectools/default.nix b/pkgs/development/python-modules/trectools/default.nix index e6e585397f42..e70b806ec17c 100644 --- a/pkgs/development/python-modules/trectools/default.nix +++ b/pkgs/development/python-modules/trectools/default.nix @@ -12,29 +12,32 @@ lxml, matplotlib, sarge, + unittestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "trectools"; - version = "0.0.49"; - format = "setuptools"; + version = "0.0.50"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "joaopalotti"; - repo = pname; + repo = "trectools"; # https://github.com/joaopalotti/trectools/issues/41 - rev = "5c1d56e9cf955f45b5a1780ee6a82744d31e7a79"; - hash = "sha256-Lh6sK2rxEdCsOUKHn1jgm+rsn8FK1f2po0UuZfZajBA="; + rev = "8a896def007e3d657eb29f820ee3de98e2f32691"; + hash = "sha256-p8BvLO+rD/l+ATE4+u3I6k25R1RVKlk2dn+RLQZTLDs="; }; postPatch = '' substituteInPlace setup.py \ - --replace "bs4 >= 0.0.0.1" "beautifulsoup4 >= 4.11.1" + --replace-fail "bs4 >= 0.0.0.1" "beautifulsoup4 >= 4.11.1" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pandas numpy scikit-learn @@ -45,17 +48,20 @@ buildPythonPackage rec { sarge ]; - checkPhase = '' - cd unittests - ${python.interpreter} -m unittest runner - ''; + unittestFlagsArray = [ + "unittests/" + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "trectools" ]; - meta = with lib; { + meta = { homepage = "https://github.com/joaopalotti/trectools"; description = "Library for assisting Information Retrieval (IR) practitioners with TREC-like campaigns"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ MoritzBoehme ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ MoritzBoehme ]; }; } diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 0cfca3c4d45a..c1d955b53820 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.8.3"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; tag = version; - hash = "sha256-Mz6n7QjNvK2HEQeWCySdxioA1dD5CLUh7jCQb1Q6mdc="; + hash = "sha256-1Qq1vV3DsslnwJq0d0MZ9bCadYD08gxLsM3tQmti4Pw="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 2bf18dcda4f1..7b1e18f0ebcf 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -9,37 +9,43 @@ pythonOlder, requests, requests-oauthlib, - six, + setuptools, vcrpy, }: buildPythonPackage rec { pname = "tweepy"; - version = "4.14.0"; - format = "setuptools"; + version = "4.15.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "tweepy"; + repo = "tweepy"; tag = "v${version}"; - hash = "sha256-ugqa85l0eWVtMUl5d+BjEWvTyH8c5NVtsnPflkHTWh8="; + hash = "sha256-vbiMwaJh4cN7OY7eYu2s8azs3A0KXvW/kRPVCx50ZVA="; }; - propagatedBuildInputs = [ - aiohttp - async-lru + build-system = [ setuptools ]; + + dependencies = [ oauthlib requests requests-oauthlib - six ]; + optional-dependencies = { + async = [ + aiohttp + async-lru + ]; + }; + nativeCheckInputs = [ pytestCheckHook vcrpy - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "tweepy" ]; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 472b5b882f8a..69493dca3e5b 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "4.3.0"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ku5qCuyRNRgermBn69YX/Z3o111xT7VIcopJM7HeplE="; + hash = "sha256-DSKonQC0U7R8SYdfQrZgG5YXV1QaLh4O9Re24kITwhs="; }; outputs = [ @@ -54,25 +54,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "typeguard" ]; - disabledTestPaths = [ - # mypy tests aren't passing with latest mypy - "tests/mypy" - ]; - - disabledTests = [ - # AssertionError: 'type of argument "x" must be ' != 'None' - "TestPrecondition::test_precondition_ok_and_typeguard_fails" - # AttributeError: 'C' object has no attribute 'x' - "TestInvariant::test_invariant_ok_and_typeguard_fails" - # AttributeError: 'D' object has no attribute 'x' - "TestInheritance::test_invariant_ok_and_typeguard_fails" - ]; - - meta = with lib; { + meta = { description = "This library provides run-time type checking for functions defined with argument type annotations"; homepage = "https://github.com/agronholm/typeguard"; changelog = "https://github.com/agronholm/typeguard/releases/tag/${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index a3449d2b4347..04eb9ad61934 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update nixfmt-classic curl jq +#!nix-shell -i bash -p nix-update curl jq set -eu -o pipefail @@ -392,5 +392,3 @@ for package in "${packages[@]}"; do }' ${source_file} done - -nixfmt ${source_file} diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 06a0307ba731..324401136cbb 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -20,24 +20,16 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lw5mLcVw1NFT1c/AOcMyo2a8aGOyxFG+ZAU6Ggnssko="; + hash = "sha256-DPfbxyPI8dVwPxOBIy55C3XNvWZqQ1Zd6/L8liCdbyg="; }; - patches = [ - (fetchpatch2 { - # update syrupy snapshots - url = "https://github.com/googlefonts/ufo2ft/commit/7a3edb2e4202cf388e3ffe31b5b3783dbb392db2.patch"; - hash = "sha256-YEgUgrtgH3PBZlt+xoJme+oPRuDMwq7M/4cJ3JbeuyU="; - }) - ]; - build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index fb0ac0e1fd8e..123ba62afdfd 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -14,32 +14,32 @@ buildPythonPackage rec { pname = "ufoprocessor"; - version = "1.9.0"; + version = "1.13.3"; + pyproject = true; src = fetchPypi { - pname = "ufoProcessor"; - inherit version; - sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; - extension = "zip"; + inherit pname version; + sha256 = "1187g7xs6z8i2hzfkqhfd59qsdvzydqnmwhaz71nsi1zf5bw59gw"; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - defcon - lxml - fonttools - fs - fontmath - fontparts - mutatormath - ]; + dependencies = + [ + defcon + fontmath + fontparts + fonttools + mutatormath + ] + ++ defcon.optional-dependencies.lxml + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.ufo; checkPhase = '' runHook preCheck for t in Tests/*.py; do - # https://github.com/LettError/ufoProcessor/issues/32 - [[ "$(basename "$t")" = "tests_fp.py" ]] || python "$t" + python "$t" done runHook postCheck ''; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 881be880d9d9..5bfc3509d174 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { # AssertionError: b'' != b'out\n' "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" + # Depends on performance of builder + "--deselect=tests/test_base.py::TestBaseUV.test_call_at" ] ++ lib.optionals (pythonOlder "3.11") [ "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix index c21ed7733ead..d6a386b0e00e 100644 --- a/pkgs/development/python-modules/vfblib/default.nix +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "vfblib"; - version = "0.7.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "LucasFonts"; repo = "vfbLib"; rev = "v${version}"; - hash = "sha256-p+uoSB3LIEi1Zvm8HgsOJcRXngZWXj3BwIlxqIBfmB4="; + hash = "sha256-padx8tq17IcO73mkSYzLCce1FCixnO0ljujKcjSDqKY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index e5968f51168b..1a66aab57537 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -105,9 +105,6 @@ let meta = { mainProgram = "gpu_stats"; - # ld: library not found for -lIOReport - # TODO: succeeds on https://github.com/NixOS/nixpkgs/pull/348827, so try again once it lands on master - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }; @@ -302,7 +299,7 @@ buildPythonPackage rec { "test_disabled_context_manager" "test_mode_disabled" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: assert not copy2_mock.called "test_copy_or_overwrite_changed_no_copy" diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix index 90e06dd619ce..74c772b54a19 100644 --- a/pkgs/development/python-modules/wat/default.nix +++ b/pkgs/development/python-modules/wat/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wat"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "igrek51"; repo = "wat"; rev = version; - hash = "sha256-52ZqLOOWxm3BtF36i9PWnNiWKQi4xjXi8vVw8pXnaVU="; + hash = "sha256-oAvweCZxUd3Sd2swjYFL3hZ3szlpVjefYb5apkR9P5U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index fa744d03ede9..a577eb617c0b 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -11,23 +11,20 @@ pythonOlder, pyyaml, setuptools, - apple-sdk_11, }: buildPythonPackage rec { pname = "watchdog"; - version = "5.0.3"; + version = "6.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EI9Cp/A0UEKoVNTQrQg0t0HUITMNX1dbgcsnuINQAXY="; + hash = "sha256-nd98gv2jro4k3s2hM47eZuHJmIPbk3Edj7lB6qLYwoI="; }; build-system = [ setuptools ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = @@ -50,12 +47,12 @@ buildPythonPackage rec { [ "--deselect=tests/test_emitter.py::test_create_wrong_encoding" "--deselect=tests/test_emitter.py::test_close" + # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 + "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # fails to stop process in teardown "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination" - # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 - "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # FileCreationEvent != FileDeletionEvent diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 351f1c6ff8e2..79a57455f714 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "2.2.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; tag = "v${version}"; - hash = "sha256-NBCR5GwmXA6COP9NOYnoD3l1vuOpym/kyNawd8FstLc="; + hash = "sha256-5WSNrUm+V7KHoWYy2NCpb/C9x5+vIb7ddEpAcv2UQZo="; }; build-system = [ setuptools ]; @@ -38,11 +38,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "webauthn" ]; - disabledTests = [ - # TypeError: X509StoreContextError.__init__() missing 1 required... - #"test_throws_on_bad_root_cert" - ]; - meta = with lib; { description = "Implementation of the WebAuthn API"; homepage = "https://github.com/duo-labs/py_webauthn"; diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index adf82573edd9..c258cc774af1 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -28,6 +28,16 @@ buildPythonPackage rec { hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY="; }; + postPatch = with stdenv.hostPlatform.uname; '' + # Configure the correct host platform for cross builds + substituteInPlace setup.py --replace-fail \ + "system = platform.system().lower()" \ + 'system = "${lib.toLower system}"' + substituteInPlace setup.py --replace-fail \ + "machine = platform.machine().lower()" \ + 'machine = "${lib.toLower processor}"' + ''; + nativeBuildInputs = [ pybind11 setuptools diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index d2ba63827282..0cd8813f694e 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, unittestCheckHook, + pythonAtLeast, pythonOlder, setuptools, }: @@ -24,38 +25,36 @@ buildPythonPackage rec { build-system = [ setuptools ]; - patchPhase = - '' - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. - sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ - tests/legacy/test_protocol.py - + disabledTests = + [ # Disables tests relying on tight timeouts to avoid failures like: # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout # ping_1_again, ping_2 = tuple(self.protocol.pings) # ValueError: too many values to unpack (expected 2) - for t in \ - test_keepalive_ping_stops_when_connection_closing \ - test_keepalive_ping_does_not_crash_when_connection_lost \ - test_keepalive_ping \ - test_keepalive_ping_not_acknowledged_closes_connection \ - test_keepalive_ping_with_no_ping_timeout \ - ; do - sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py - done - '' - + lib.optionalString (pythonOlder "3.11") '' + "test_keepalive_ping_stops_when_connection_closing" + "test_keepalive_ping_does_not_crash_when_connection_lost" + "test_keepalive_ping" + "test_keepalive_ping_not_acknowledged_closes_connection" + "test_keepalive_ping_with_no_ping_timeout" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/python-websockets/websockets/issues/1569 + "test_writing_in_send_context_fails" + ] + ++ lib.optionals (pythonOlder "3.11") [ # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError - sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py - sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/asyncio/test_client.py - ''; + "test_reject_invalid_server_certificate" + ]; nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' # https://github.com/python-websockets/websockets/issues/1509 export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=100 + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. + sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ + tests/legacy/test_protocol.py ''; # Tests fail on Darwin with `OSError: AF_UNIX path too long` diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 84a9d63536e0..dfbaf61a1e74 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "xattr"; - version = "1.1.0"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/svzsFBD7TSHooGQ3sPkxNh5svzsDjC6/Y7F1LYENjA="; + hash = "sha256-t7AuyyJw2lt+feruqPi1KMFzaEAcK51fY+kfVFtF03I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 930d3bb607c7..b7dc2eda8bca 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "5.3.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,17 +20,20 @@ buildPythonPackage rec { owner = "23andMe"; repo = "yamale"; tag = version; - hash = "sha256-fYH+0OUJ9EnsAQh/VUOUVms1jwqpcLBj/c5uLj/1gVc="; + hash = "sha256-Ij9jhGMYHUStZ/xR5GUg/eF6YQdtIfpLU7g1pev6wJU="; }; build-system = [ setuptools ]; dependencies = [ pyyaml - ruamel-yaml ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + ruamel = [ ruamel-yaml ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.ruamel; pythonImportsCheck = [ "yamale" ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index d31124a9ac1e..96fc13860e80 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "zconfig"; - version = "4.1"; + version = "4.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-tqed2hV/NpjIdo0s7cJjIW6K8kDTz50JoCpkKREU6yA="; + hash = "sha256-oOS1J3xM7oBgzjNaV4rEWPgsJArpaxZlkgDbxNmL/M4="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ docutils manuel ]; - propagatedBuildInputs = [ zope-testrunner ]; + dependencies = [ zope-testrunner ]; nativeCheckInputs = [ pygments diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index d6bbfdeef960..981dd8ac6023 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-DO5AZDS7XvExxATtbkFOLG66zQOZu4gE6VWOG7C3qGA="; + hash = "sha256-pLdAlQBq/d9fohkPgGV/bR7rOl4RreenbHXYdde8q/0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-GolnCEsqCGxjrKl2qXVRi9+d8hwXNsRVdfI7Cf60/jg="; + hash = "sha256-R6Vux4cNL9/Fxi7UvItZT8E539cz5cAupT9X0UkdwR4="; }; build-system = [ diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index d2fd413d4309..5e550fec189a 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -6,7 +6,6 @@ writeScript, common-updater-scripts, git, - nixfmt-classic, nix, coreutils, gnused, @@ -51,18 +50,14 @@ let git gnused nix - nixfmt-classic ] } oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" if [ "$oldVersion" != "$latestTag" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix" update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes - sed -i "s|$latestTag|$oldVersion|g" "$default_nix" + sed -i "s|$latestTag|$oldVersion|g" "$(git rev-parse --show-toplevel)/pkgs/development/tools/ammonite/default.nix" update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index f2e6f7f67409..c2ceec732117 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.23.0"; + version = "3.24.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-xcNKM4BFe5t1YG34kBAuffLHArlCDC6++VQPi11WJk0="; + hash = "sha256-ca7iAr3vGuc4mMz36cMVE0+n22wkYGOvxQOu9wLsA70="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index e5fc56c2249b..81cfedf6f604 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -43,17 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals guileEnabled [ guile ]; - configureFlags = - lib.optional guileEnabled "--with-guile" - - # Make uses this test to decide whether it should keep track of - # subseconds. Apple made this possible with APFS and macOS 10.13. - # However, we still support macOS 10.11 and 10.12. Binaries built - # in Nixpkgs will be unable to use futimens to set mtime less than - # a second. So, tell Make to ignore nanoseconds in mtime here by - # overriding the autoconf test for the struct. - # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + configureFlags = lib.optional guileEnabled "--with-guile"; outputs = [ "out" diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index fc0ab09fd0a4..6a5da56092d8 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -3,25 +3,10 @@ newScope, python3, recurseIntoAttrs, - fetchFromGitHub, }: # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { - python = python3.override { - self = self.python; - packageOverrides = self: super: { - service-identity = super.service-identity.overridePythonAttrs (oldAttrs: { - version = "24.2.0"; - src = fetchFromGitHub { - owner = "pyca"; - repo = "service-identity"; - tag = "24.2.0"; - hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; - }; - checkInputs = [ super.pyopenssl ]; - }); - }; - }; + python = python3; buildbot-pkg = self.callPackage ./pkg.nix { }; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index e3a0f9609c0e..66ccab402e2f 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,39 +1,29 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, fetchpatch -, python3 -, flex -, bison -, qt5 -, CoreServices -, libiconv -, spdlog -, sqlite +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + python3, + flex, + bison, + qt5, + CoreServices, + libiconv, + spdlog, + sqlite, }: stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; - rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4zSaM49TjOaZvrUChM4dNJLondCsQPSArOXZnTHS4yI="; + tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-XKzH2nMByE0WE7WX4YYj2boq9+iwD7SyO5w9/4g9cGE="; }; - patches = [ - # fix clang-19 build. can drop on next update - # https://github.com/doxygen/doxygen/pull/11064 - (fetchpatch { - name = "fix-clang-19-build.patch"; - url = "https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f.patch"; - hash = "sha256-TtkVfV9Ep8/+VGbTjP4NOP8K3p1+A78M+voAIQ+lzOk="; - }) - ]; - # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 postPatch = '' substituteInPlace CMakeLists.txt \ @@ -49,8 +39,19 @@ stdenv.mkDerivation rec { bison ]; - buildInputs = [ libiconv spdlog sqlite ] - ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) + buildInputs = + [ + libiconv + spdlog + sqlite + ] + ++ lib.optionals (qt5 != null) ( + with qt5; + [ + qtbase + wrapQtAppsHook + ] + ) ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ @@ -60,18 +61,21 @@ stdenv.mkDerivation rec { ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; # put examples in an output so people/tools can test against them - outputs = [ "out" "examples" ]; + outputs = [ + "out" + "examples" + ]; + postInstall = '' cp -r ../examples $examples ''; meta = { license = lib.licenses.gpl2Plus; - homepage = "https://www.doxygen.nl/"; + homepage = "https://www.doxygen.nl"; changelog = "https://www.doxygen.nl/manual/changelog.html"; description = "Source code documentation generator tool"; mainProgram = "doxygen"; - longDescription = '' Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming @@ -81,7 +85,6 @@ stdenv.mkDerivation rec { off-line reference manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index b08e7251e9e2..9c6a90965f7f 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - # Wrap the given `aclocal' program, appending extra `-I' flags # corresponding to the directories listed in $ACLOCAL_PATH. (Note # that `wrapProgram' can't be used for that purpose since it can only diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index df07a2f6a5bf..fb9b3f26b7ee 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libtool"; - version = "2.4.7"; + version = "2.5.4"; src = fetchurl { url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; - sha256 = "sha256-BOlsJATqcMWQxUbrpCAqThJyLGQAFsErmy8c49SB6ag="; + sha256 = "sha256-2o67LOTc9GuQCY2vliz/po9LT2LqYPeY0O8Skp7eat8="; }; outputs = [ "out" "lib" ]; diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index f575110b87fd..53de05307568 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -108,9 +108,9 @@ let in { antlr4_13 = (mkAntlr { - version = "4.13.0"; - sourceSha256 = "sha256-s1yAdScMYg1wFpYNsBAtpifIhQsnSAgJg7JjPDx+htc="; - jarSha256 = "sha256-vG9KvA0iWidXASbFFAJWnwAKje2jSHtw52QoQOVw5KY="; + version = "4.13.2"; + sourceSha256 = "sha256-DxxRL+FQFA+x0RudIXtLhewseU50aScHKSCDX7DE9bY="; + jarSha256 = "sha256-6uLfoRmmQydERnKv9j6ew1ogGA3FuAkLemq4USXfTXY="; extraCppCmakeFlags = [ # Generate CMake config files, which are not installed by default. "-DANTLR4_INSTALL=ON" diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 857cad5eabce..fd10f7877a9d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -1,24 +1,24 @@ -{ lib -, stdenv -, fetchgit -, fetchFromGitHub -, nix-update-script -, runCommand -, which -, rustPlatform -, emscripten -, Security -, callPackage -, linkFarm -, substitute -, CoreServices -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? stdenv.hostPlatform.isStatic -, webUISupport ? false -, extraGrammars ? { } +{ + lib, + stdenv, + fetchgit, + fetchFromGitHub, + nix-update-script, + runCommand, + which, + rustPlatform, + emscripten, + callPackage, + linkFarm, + substitute, + installShellFiles, + enableShared ? !stdenv.hostPlatform.isStatic, + enableStatic ? stdenv.hostPlatform.isStatic, + webUISupport ? false, + extraGrammars ? { }, -# tests -, lunarvim + # tests + lunarvim, }: let @@ -27,8 +27,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.24.4"; - hash = "sha256-DIlPEz8oTzLm5BZHPjIQCHDHUXdUhL+LRrkld11HzXw="; + version = "0.24.6"; + hash = "sha256-L7F2/S22knqEdB2hxfqLe5Tcgk0WQqBdFQ7BvHFl4EI="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -40,20 +40,35 @@ let update-all-grammars = callPackage ./update.nix { }; - fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; }); + fetchGrammar = ( + v: + fetchgit { + inherit (v) + url + rev + sha256 + fetchSubmodules + ; + } + ); - grammars = - runCommand "grammars" { } ('' + grammars = runCommand "grammars" { } ( + '' mkdir $out - '' + (lib.concatStrings (lib.mapAttrsToList - (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") - (import ./grammars { inherit lib; })))); + '' + + (lib.concatStrings ( + lib.mapAttrsToList ( + name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n" + ) (import ./grammars { inherit lib; }) + )) + ); buildGrammar = callPackage ./grammar.nix { }; builtGrammars = let - build = name: grammar: + build = + name: grammar: buildGrammar { language = grammar.language or name; inherit version; @@ -62,17 +77,59 @@ let generate = grammar.generate or false; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; - grammars = grammars' // - { tree-sitter-latex = grammars'.tree-sitter-latex // { generate = true; }; } // - { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "grammars/ocaml"; }; } // - { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "grammars/interface"; }; } // - { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "tree-sitter-org"; }; } // - { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // - { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; } // - { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // - { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "tree-sitter-markdown_inline"; location = "tree-sitter-markdown-inline"; }; } // - { tree-sitter-php = grammars'.tree-sitter-php // { location = "php"; }; } // - { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; }; + grammars = + grammars' + // { + tree-sitter-latex = grammars'.tree-sitter-latex // { + generate = true; + }; + } + // { + tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { + location = "grammars/ocaml"; + }; + } + // { + tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { + location = "grammars/interface"; + }; + } + // { + tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { + language = "tree-sitter-org"; + }; + } + // { + tree-sitter-typescript = grammars'.tree-sitter-typescript // { + location = "typescript"; + }; + } + // { + tree-sitter-tsx = grammars'.tree-sitter-typescript // { + location = "tsx"; + }; + } + // { + tree-sitter-markdown = grammars'.tree-sitter-markdown // { + location = "tree-sitter-markdown"; + }; + } + // { + tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { + language = "tree-sitter-markdown_inline"; + location = "tree-sitter-markdown-inline"; + }; + } + // { + tree-sitter-php = grammars'.tree-sitter-php // { + location = "php"; + }; + } + // { + tree-sitter-sql = grammars'.tree-sitter-sql // { + generate = true; + }; + }; in lib.mapAttrs build (grammars); @@ -83,26 +140,27 @@ let # pkgs.tree-sitter.withPlugins (_: allGrammars) # which is equivalent to # pkgs.tree-sitter.withPlugins (p: builtins.attrValues p) - withPlugins = grammarFn: + withPlugins = + grammarFn: let grammars = grammarFn builtGrammars; in - linkFarm "grammars" - (map - (drv: - let - name = lib.strings.getName drv; - in - { - name = - (lib.strings.replaceStrings [ "-" ] [ "_" ] - (lib.strings.removePrefix "tree-sitter-" - (lib.strings.removeSuffix "-grammar" name))) - + ".so"; - path = "${drv}/parser"; - } - ) - grammars); + linkFarm "grammars" ( + map ( + drv: + let + name = lib.strings.getName drv; + in + { + name = + (lib.strings.replaceStrings [ "-" ] [ "_" ] ( + lib.strings.removePrefix "tree-sitter-" (lib.strings.removeSuffix "-grammar" name) + )) + + ".so"; + path = "${drv}/parser"; + } + ) grammars + ); allGrammars = builtins.attrValues builtGrammars; @@ -111,30 +169,20 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-32CcOb5op+7QOgLSw+8rvMW3GjJ0jaQsryX5DiW+bIk="; + cargoHash = "sha256-mk3aw1aFu7N+b4AQL5kiaHuIAuJv24KonFeGKid427Q="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; - nativeBuildInputs = - [ which ] - ++ lib.optionals webUISupport [ emscripten ]; + buildInputs = [ installShellFiles ]; + nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; - patches = lib.optionals webUISupport [ + patches = lib.optionals (!webUISupport) [ (substitute { - src = ./fix-paths.patch; - substitutions = [ "--subst-var-by" "emcc" "${emscripten}/bin/emcc" ]; + src = ./remove-web-interface.patch; }) ]; - postPatch = lib.optionalString (!webUISupport) '' - # remove web interface - sed -e '/pub mod playground/d' \ - -i cli/src/lib.rs - sed -e 's/playground,//' \ - -e 's/playground::serve(&grammar_path.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \ - -i cli/src/main.rs - sed -e 's/playground::serve(.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \ - -i cli/src/main.rs + postPatch = lib.optionalString webUISupport '' + substituteInPlace cli/loader/src/lib.rs \ + --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";' ''; # Compile web assembly with emscripten. The --debug flag prevents us from @@ -150,6 +198,10 @@ rustPlatform.buildRustPackage { PREFIX=$out make install ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + installShellCompletion --cmd tree-sitter \ + --bash <("$out/bin/tree-sitter" complete --shell bash) \ + --zsh <("$out/bin/tree-sitter" complete --shell zsh) \ + --fish <("$out/bin/tree-sitter" complete --shell fish) ''; # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out @@ -159,7 +211,13 @@ rustPlatform.buildRustPackage { updater = { inherit update-all-grammars; }; - inherit grammars buildGrammar builtGrammars withPlugins allGrammars; + inherit + grammars + buildGrammar + builtGrammars + withPlugins + allGrammars + ; updateScript = nix-update-script { }; @@ -188,6 +246,9 @@ rustPlatform.buildRustPackage { * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = with lib.maintainers; [ + Profpatsch + uncenter + ]; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch b/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch deleted file mode 100644 index 478ccb45ff9b..000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs -index 4e3effed..74b4d3e3 100644 ---- a/cli/loader/src/lib.rs -+++ b/cli/loader/src/lib.rs -@@ -969,7 +969,7 @@ impl Loader { - } - - let root_path = root_path.unwrap_or(src_path); -- let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" }; -+ let emcc_name = if cfg!(windows) { "emcc.bat" } else { "@emcc@" }; - - // Order of preference: emscripten > docker > podman > error - let source = if !force_docker && Command::new(emcc_name).output().is_ok() { diff --git a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch b/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch new file mode 100644 index 000000000000..02b3d432a5e1 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch @@ -0,0 +1,38 @@ +diff --git a/cli/src/lib.rs b/cli/src/lib.rs +index 4a00747e..e17d253b 100644 +--- a/cli/src/lib.rs ++++ b/cli/src/lib.rs +@@ -5,7 +5,6 @@ pub mod highlight; + pub mod init; + pub mod logger; + pub mod parse; +-pub mod playground; + pub mod query; + pub mod query_testing; + pub mod tags; +diff --git a/cli/src/main.rs b/cli/src/main.rs +index 1758fada..4bc56cc2 100644 +--- a/cli/src/main.rs ++++ b/cli/src/main.rs +@@ -23,7 +23,7 @@ use tree_sitter_cli::{ + init::{generate_grammar_files, get_root_path, migrate_package_json, JsonConfigOpts}, + logger, + parse::{self, ParseFileOptions, ParseOutput}, +- playground, query, tags, ++ query, tags, + test::{self, TestOptions}, + test_highlight, test_tags, util, wasm, + }; +@@ -1205,10 +1205,8 @@ impl Tags { + + impl Playground { + fn run(self, current_dir: &Path) -> Result<()> { +- let open_in_browser = !self.quiet; +- let grammar_path = self.grammar_path.as_deref().map_or(current_dir, Path::new); +- playground::serve(grammar_path, open_in_browser)?; +- Ok(()) ++ println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); ++ std::process::exit(1); + } + } + diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 00a7bdc6a01e..6dd050841b0b 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -6,7 +6,7 @@ sysprof, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libsysprof-capture"; inherit (sysprof) src version; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 01de2e761ea9..837a0c8f0572 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -23,9 +23,9 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sysprof"; - version = "47.0"; + version = "47.2"; outputs = [ "out" @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-dCTGKUNGYGVCiMBCSJmMNX0c6H7hVZ/UTfGYCZLvXfU="; + url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz"; + hash = "sha256-5LXt6f2XjsPw1aDUTQQpptIBw2K/bLRScxkDGuRixU8="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "sysprof"; }; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 70e695cb1f05..c93bb562fe31 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -5,15 +5,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.70.1"; + version = "0.71.1"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - hash = "sha256-6FRcW/VGqlmLjb64UYqk21HmQ8u0AdVD3S2F+9D/vQo="; + hash = "sha256-RL9P0dPYWLlEGgGWZuIvyULJfH+c/B+3sySVadJQS3w="; }; - cargoHash = "sha256-oTeIh5278nckh5fFaEFjWht11ovGmN80MaLJl4k4NAs="; + cargoHash = "sha256-i92f9grVqVqWmOKkLcBxB1Brk5KztJpPi9zSxVcgXfY="; buildInputs = [ (lib.getLib clang.cc) ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 2c4f996aa2a6..fece685a4fa4 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -148,10 +148,6 @@ let # Note: do not set TERM=dumb environment variable globally, it is used in # test-ci-js test suite to skip tests that otherwise run fine. NINJA = "TERM=dumb ninja"; - } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { - # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. - # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. - NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300 -Wno-macro-redefined"; }; # NB: technically, we do not need bash in build inputs since all scripts are diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 2da784c93f18..2e4645af5590 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.11.0"; - sha256 = "bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35"; + version = "22.12.0"; + sha256 = "fe1bc4be004dc12721ea2cb671b08a21de01c6976960ef8a1248798589679e16"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,19 +21,10 @@ buildNodejs { # Fix for https://github.com/NixOS/nixpkgs/issues/355919 # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) (fetchpatch2 { url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; }) - # Patch to use the shared version of SQLite instead of the one vendored upstream: - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/32f7d5ad1cf79e7e731e1bb7ac967f4f2a3194cf.patch?full_index=1"; - hash = "sha256-dyUr3caGfetrXgfAl+CLE1LKKetDZCpPwMg4EM98rqI="; - }) # fixes test failure, remove when included in release (fetchpatch2 { url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 43cbaa2b8e71..f5048109cab7 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -14,8 +14,8 @@ let in buildNodejs { inherit enableNpm; - version = "23.2.0"; - sha256 = "3cf7a8a36682775693691f1de901bb5973ad3c0ae2aa87b1add9de515e7b2fc7"; + version = "23.5.0"; + sha256 = "32e77b36c0774c68baab41bc7c2acc58663ca0a2b7c4d3e9bec6f761c15fdac0"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -25,20 +25,10 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 # FIXME: remove after a minor point release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; - }) - # fixes test failure, remove when included in release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; + hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; }) ]; } diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index f6d88446c682..b41499b042ee 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -5,7 +5,6 @@ fetchurl, libsForQt5, qt6Packages, - stdenv, cmark, gpgme, taglib, diff --git a/pkgs/kde/gear/audiocd-kio/default.nix b/pkgs/kde/gear/audiocd-kio/default.nix index b4fa60026b18..c99990ff606c 100644 --- a/pkgs/kde/gear/audiocd-kio/default.nix +++ b/pkgs/kde/gear/audiocd-kio/default.nix @@ -5,7 +5,7 @@ flac, libogg, libvorbis, - substituteAll, + replaceVars, lame, opusTools, }: @@ -13,8 +13,7 @@ mkKdeDerivation { pname = "audiocd-kio"; patches = [ - (substituteAll { - src = ./encoder-paths.patch; + (replaceVars ./encoder-paths.patch { lame = lib.getExe lame; opusenc = "${opusTools}/bin/opusenc"; }) diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index 3bc3abd422ea..d81c487e452f 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, sshfs, qtconnectivity, qtmultimedia, @@ -15,8 +15,7 @@ mkKdeDerivation { pname = "kdeconnect-kde"; patches = [ - (substituteAll { - src = ./hardcode-sshfs-path.patch; + (replaceVars ./hardcode-sshfs-path.patch { sshfs = lib.getExe sshfs; }) ]; diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index 4127b9c24f94..597cb8cc80de 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, samba, shadow, qtdeclarative, @@ -10,8 +10,7 @@ mkKdeDerivation { pname = "kdenetwork-filesharing"; patches = [ - (substituteAll { - src = ./dependency-paths.patch; + (replaceVars ./dependency-paths.patch { inherit samba; usermod = lib.getExe' shadow "usermod"; }) diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 6bc08951f3cc..7746320e4d7b 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -1,6 +1,6 @@ { mkKdeDerivation, - substituteAll, + replaceVars, qtsvg, qtmultimedia, qtnetworkauth, @@ -17,8 +17,7 @@ mkKdeDerivation { pname = "kdenlive"; patches = [ - (substituteAll { - src = ./dependency-paths.patch; + (replaceVars ./dependency-paths.patch { inherit mediainfo mlt glaxnimate; ffmpeg = ffmpeg-full; }) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 232d8569e4ce..40280e6404f7 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/attica-6.9.0.tar.xz", - "hash": "sha256-hjWSyjfU+XvffjTfuPnxIIly+effo/omDqRy4SzRfBY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/attica-6.10.0.tar.xz", + "hash": "sha256-82wurLytjAgDbp91JRRL7J98XYbxFQ1J+duePcFKv0U=" }, "baloo": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/baloo-6.9.0.tar.xz", - "hash": "sha256-0fTnWdFAdONlllIiB2yHU58h4k2Oh2i+fJ+WA4hTYNA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/baloo-6.10.0.tar.xz", + "hash": "sha256-VIAZdA2UYtEK2GL8+AG+8WY2UxXa9zIJrYbLduASryo=" }, "bluez-qt": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/bluez-qt-6.9.0.tar.xz", - "hash": "sha256-EG3relMbKrgQb0/B6mYdhFfLj/eTxDai67nxgnwCF8g=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/bluez-qt-6.10.0.tar.xz", + "hash": "sha256-YqR7dwViXW66gtJk9fpCgg//r8je9lyc0AZAtHN8gi0=" }, "breeze-icons": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/breeze-icons-6.9.0.tar.xz", - "hash": "sha256-YY9jO6+wpaq6qT6qZzPf69bnkwPvHQqT3PJJGBiWvtk=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/breeze-icons-6.10.0.tar.xz", + "hash": "sha256-/kWOuVe+ZV6oAdQfHdPEz6gp57pgQLONadCfa2nDHio=" }, "extra-cmake-modules": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/extra-cmake-modules-6.9.0.tar.xz", - "hash": "sha256-zsBrJeFm7bcaGpc2QcT1/DyHEt3j+z5jnbWGUVzBZC4=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/extra-cmake-modules-6.10.0.tar.xz", + "hash": "sha256-UGmJoNQAkTQD5mnBkSI42wU81rON/3Sxfi5vh5x5zKA=" }, "frameworkintegration": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/frameworkintegration-6.9.0.tar.xz", - "hash": "sha256-ua+z2U3KGp5ATLGcmbrK5+TaaH4PFUueOWny+cOOnbg=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/frameworkintegration-6.10.0.tar.xz", + "hash": "sha256-Yfw1z/sIY1F/ogcrlkdr8QlJnVj7MmQGK0C+Uo3Tr4I=" }, "kapidox": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kapidox-6.9.0.tar.xz", - "hash": "sha256-eCHAYSZflabbcOrpjunlYCxeYBvWbD189s0PRYqQgzE=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kapidox-6.10.0.tar.xz", + "hash": "sha256-4occRoet+KNo2yMd51JdN1EOonVGO9JxKJhsaZEpdMQ=" }, "karchive": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/karchive-6.9.0.tar.xz", - "hash": "sha256-JGrY3StfuD3xywX/H9OTT4pSvpTRJDUPnmt8NCDpxHQ=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/karchive-6.10.0.tar.xz", + "hash": "sha256-rFFgwZ3RELva3rqcU1XL/TtcG9AM49vcSghXdmmMikg=" }, "kauth": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kauth-6.9.0.tar.xz", - "hash": "sha256-hM8VcpvSSKqdeMG/7PaBYXgtUhrBSptqW9rMKcvj3sY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kauth-6.10.0.tar.xz", + "hash": "sha256-viVgG5GxKaSOSXIxviUToeuMlweoLTg5VWFlbR3xCYg=" }, "kbookmarks": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kbookmarks-6.9.0.tar.xz", - "hash": "sha256-kyI0vtv1pYh/I8YQAQyMcLNrXc5PTExddvR6ks6OV3o=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kbookmarks-6.10.0.tar.xz", + "hash": "sha256-iR6xLSuaLDzfv9uiUFmcVE1xhs6NHvB/T8TM4dV6lFs=" }, "kcalendarcore": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcalendarcore-6.9.0.tar.xz", - "hash": "sha256-hhcn+VNo6XOcETX4nRegtJnaa3Dhbx7146VlIuWmQQw=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcalendarcore-6.10.0.tar.xz", + "hash": "sha256-mI8v1kg0GWc4TZXT0Su5Nqinc3qTHnLCtWFgULwwM2o=" }, "kcmutils": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcmutils-6.9.0.tar.xz", - "hash": "sha256-eb8qGKtOqOF1KxT1lkzkSQe1HhxfyNy2IMZv1f2zaic=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcmutils-6.10.0.tar.xz", + "hash": "sha256-pLy0sE7koDqan9u5bCc2Ah2Usiwi+NXV0Ve5zpgusAE=" }, "kcodecs": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcodecs-6.9.0.tar.xz", - "hash": "sha256-yIpN70Vkp0a7imp8EnCUrpt+R+GlrST4f/tmQ9QrDLE=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcodecs-6.10.0.tar.xz", + "hash": "sha256-lhg/+7GFAs1ntvx4rChuIz70buDXE+4d8stME48hQaA=" }, "kcolorscheme": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcolorscheme-6.9.0.tar.xz", - "hash": "sha256-cb6q4IspS16/JcUXSh1Vys3OXomR6RZ9FDpEi5V0KBo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcolorscheme-6.10.0.tar.xz", + "hash": "sha256-8HDtWT8dQBCvWlbiR1Mr6WosfKm+/JIrCEwWIVr3m98=" }, "kcompletion": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcompletion-6.9.0.tar.xz", - "hash": "sha256-3M5BU/oTose4b1+yZBN3/tpYfkr0eKOTf7m8cnXbiRw=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcompletion-6.10.0.tar.xz", + "hash": "sha256-tW6SW76IHIn86cgEQeFWWtGt/LFvHKxbsIooH7kzS8k=" }, "kconfig": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kconfig-6.9.0.tar.xz", - "hash": "sha256-uLnfsLxbwPnEUWTgLJiN2KsQo0rqDICxlF/QsyZ6xvk=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kconfig-6.10.0.tar.xz", + "hash": "sha256-AO8sdb5ous+MMOO/ByNYuPbSvHjUYuexTAhoCMadjX8=" }, "kconfigwidgets": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kconfigwidgets-6.9.0.tar.xz", - "hash": "sha256-yVaMvdkWmklqJikzg8xPfHnpSHH3apFG+xZ8PHWbBMo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kconfigwidgets-6.10.0.tar.xz", + "hash": "sha256-XLF7yvquPu/BRPsQFPFMuZmMnhO3FICNlAqyDZwPtRw=" }, "kcontacts": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcontacts-6.9.0.tar.xz", - "hash": "sha256-xklGI72GbW9vmkL9DH/yvE2Yyo2Ut+aPhSmvCfMh/Jw=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcontacts-6.10.0.tar.xz", + "hash": "sha256-tiKtARklWE+4LPC/6nE/3dQQHEerbCPvtfuHjxpptG0=" }, "kcoreaddons": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcoreaddons-6.9.0.tar.xz", - "hash": "sha256-nOee7v9iwN9Gvh2xdjA0Tpvuf2NlVEHmJpI9PU+Yb70=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcoreaddons-6.10.0.tar.xz", + "hash": "sha256-ib8odHkV6YfKshx3OXsJccr/oSWLb1dVQ9c9QYgYSnI=" }, "kcrash": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kcrash-6.9.0.tar.xz", - "hash": "sha256-qXNOSK1CW7QmKU8t5rre87SF/1ubsnO6Uf4srHqnpFY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kcrash-6.10.0.tar.xz", + "hash": "sha256-wDKdpqwoqqyCTbI15XiZnkpIflztuzzsOmo56e6bXbQ=" }, "kdav": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdav-6.9.0.tar.xz", - "hash": "sha256-WsWBjom8noEZ8QpGvDyOVIeNtOmhLDoHSB3ryNU2y9M=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdav-6.10.0.tar.xz", + "hash": "sha256-Lo7/Pow1ABaIgHqX5JCm54Uaehof33LfVVmGO4YSkD0=" }, "kdbusaddons": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdbusaddons-6.9.0.tar.xz", - "hash": "sha256-MKCxj3AoMO4+mulPDZU7C/g189nINssiNm3kgGWjp0w=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdbusaddons-6.10.0.tar.xz", + "hash": "sha256-6Iv6pqEPgNn3shFigcRIUhOYTK7VVaxoVXu1PuiLuzI=" }, "kdeclarative": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdeclarative-6.9.0.tar.xz", - "hash": "sha256-GiZt0qKRL/5jLkVdgjp2ydv7RJd8B4OLxE5FflvsmOs=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdeclarative-6.10.0.tar.xz", + "hash": "sha256-256yteYVtISUnkGsWgXFzqE24jHRWj3iA5As7c39nnM=" }, "kded": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kded-6.9.0.tar.xz", - "hash": "sha256-OddDQ9uQG4QZJEc470xtnosaMzEnjVX1eBGwFq2wKp8=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kded-6.10.0.tar.xz", + "hash": "sha256-VgHZ2/3JUH/q8X9HdLt9EtOMfhlySui5h2OaFv8Oao4=" }, "kdesu": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdesu-6.9.0.tar.xz", - "hash": "sha256-GoSkYTce0JhOerIlyXToDl8a+3DfzldYKptnzbQO0bo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdesu-6.10.0.tar.xz", + "hash": "sha256-WrmTq8qFy1eYu0N7lqKz2IB534YSjuMNZu4R9g5Rwi4=" }, "kdnssd": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdnssd-6.9.0.tar.xz", - "hash": "sha256-UnxWWfRAl/vrU8K/M20qA1+/KFNfdJFmLGdYJZ4edlo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdnssd-6.10.0.tar.xz", + "hash": "sha256-/Y8IUB/EC5op/DcPf3hxCD8kiZIuG9ULxbD9eAF9qic=" }, "kdoctools": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kdoctools-6.9.0.tar.xz", - "hash": "sha256-bMQ/fbbfcDzeHG+7JN68+xHD348Xa+EBV34hWC0CCco=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kdoctools-6.10.0.tar.xz", + "hash": "sha256-A/qY4SEyNe5NSDnRbj7bIu5WhJuasD0UBjnPn6y2sDg=" }, "kfilemetadata": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kfilemetadata-6.9.0.tar.xz", - "hash": "sha256-0XtpLqesDZuuyx3OOqEKVi2zqa5+ktwrncYETfoR3As=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kfilemetadata-6.10.0.tar.xz", + "hash": "sha256-EAtIdwoWuOEt0+xAdb3TuDM+eWLS/HSSzQd9zAPjw1U=" }, "kglobalaccel": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kglobalaccel-6.9.0.tar.xz", - "hash": "sha256-BhpQb1zO/mLF2Spu0Qm08B4UpMi9XUK2IsjIRH914f0=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kglobalaccel-6.10.0.tar.xz", + "hash": "sha256-BbDsakTUPOepz9bNcMjQfcpcX2IWlor4Eo/ppe2bGSg=" }, "kguiaddons": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kguiaddons-6.9.0.tar.xz", - "hash": "sha256-98MgvqX7D8wkfgThCS4ZIGoSmIUxEqh8ZQctM63IRoo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kguiaddons-6.10.0.tar.xz", + "hash": "sha256-s74EB3MT5VnFqPZkkdXShs7+lHqvfIk3VEzoWvSFP/o=" }, "kholidays": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kholidays-6.9.0.tar.xz", - "hash": "sha256-tAnsy6v9ayl3GVPGoDduT34WwNUzbV/oO29reh94bgA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kholidays-6.10.0.tar.xz", + "hash": "sha256-eI7+ynpVJMWmaGI6uoMK1th1qicR8MrF8jKa3Sq0RY0=" }, "ki18n": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/ki18n-6.9.0.tar.xz", - "hash": "sha256-c2rhDjqMXc7RVdM0f529kcNPSF10lYFfhfTWJGgaGGA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/ki18n-6.10.0.tar.xz", + "hash": "sha256-L1nwk/jONAq0bFVrNcLq0rlt/rL/ACTFU6yMU+m4oRo=" }, "kiconthemes": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kiconthemes-6.9.0.tar.xz", - "hash": "sha256-4k1LT4vQnW7dYeffsgMwFzUkUuroecEmAgCoHUi8mW4=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kiconthemes-6.10.0.tar.xz", + "hash": "sha256-FYB+eFGDwEiBCvAUGzpWAIXyu/APOiH+li6zemc/kxQ=" }, "kidletime": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kidletime-6.9.0.tar.xz", - "hash": "sha256-4WZe8xRmDYST8zAGnEd9HIz7CXe+S584DY5yayaU0kI=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kidletime-6.10.0.tar.xz", + "hash": "sha256-+iX+hmrv1FNgIhQoIs6YVveoX/qVBwmAUn3psx6rCYg=" }, "kimageformats": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kimageformats-6.9.0.tar.xz", - "hash": "sha256-gxfc5mp3NkjFwA8KZ2FWxO5OcdfJhUCQDDG3twpQ9t8=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kimageformats-6.10.0.tar.xz", + "hash": "sha256-4W8y7mQ5MZmig5Qvb+e293s3RgNPkOQkRonCj6qx+dM=" }, "kio": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kio-6.9.0.tar.xz", - "hash": "sha256-U2CWKwubwG0B+GiIyJbKWRzNLQvKebf1zENnpuMbNos=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kio-6.10.0.tar.xz", + "hash": "sha256-frRUQ48Unn7VE8O71Sa2fj4+z+Mq58mGFouqWWALaZw=" }, "kirigami": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kirigami-6.9.0.tar.xz", - "hash": "sha256-o0Kci89A4lLRGwpMNaQ8BDOpg16hszNYBwc3m3tcgsA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kirigami-6.10.0.tar.xz", + "hash": "sha256-LiRf/Xnsofz7WR9D/znnwvUWDoaKNuIOu+LWbFUNqNQ=" }, "kitemmodels": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kitemmodels-6.9.0.tar.xz", - "hash": "sha256-q02vwMqCGfpHiUOfWsoIpyusYNoLKQJnEGNq9+iLcyQ=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kitemmodels-6.10.0.tar.xz", + "hash": "sha256-g4WaSu5nv152ipMyVCImTLnoRwE/KBxcsC5jHDs7AAc=" }, "kitemviews": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kitemviews-6.9.0.tar.xz", - "hash": "sha256-h0sH1CmdgSqI8ei1+ONWzpjCuCPlJ686cpCcosUOPPM=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kitemviews-6.10.0.tar.xz", + "hash": "sha256-ixX/VxnqZenQxyLupkEuMS0F2dpJyHLK+dl9Mp1W120=" }, "kjobwidgets": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kjobwidgets-6.9.0.tar.xz", - "hash": "sha256-gYZ5eKOt1cJTnmrEz9FxGuRM61D0ZU9ZjF3QqwVVNxY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kjobwidgets-6.10.0.tar.xz", + "hash": "sha256-7j/10hyEhJWdCvGXanwbqwH0NoQU3y67LLhUCzwoaRs=" }, "knewstuff": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/knewstuff-6.9.0.tar.xz", - "hash": "sha256-rjc4UV0X7LVqK02xeioxfxs2dlGPw11GFjG8tvpGxOo=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/knewstuff-6.10.0.tar.xz", + "hash": "sha256-gctepU/gPSf4Ckgd3hinZ8oalSZ0A72HSDz92BmB5Oc=" }, "knotifications": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/knotifications-6.9.0.tar.xz", - "hash": "sha256-Mz/hvRekqRjOptUf0FNci4jh+y5PgspzDQ+LSPDwQi8=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/knotifications-6.10.0.tar.xz", + "hash": "sha256-NreIHVBADze0866qTApqlD5Xg9NUQeKwys3G2tBq8qE=" }, "knotifyconfig": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/knotifyconfig-6.9.0.tar.xz", - "hash": "sha256-GbAwR35gn/V20tgIhnM68gm10NI4TdHRGHfLncOApIk=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/knotifyconfig-6.10.0.tar.xz", + "hash": "sha256-8LpEeljt79gwKQXtiAMCkZkOJz7e2X0R0rfemGo10Fw=" }, "kpackage": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kpackage-6.9.0.tar.xz", - "hash": "sha256-YqdriWN4tLejklKPv7n/hCf5n3J/8n4qXgb+XL71Z6k=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kpackage-6.10.0.tar.xz", + "hash": "sha256-D0nBzbSeAcbc43KrvJgUzL10t/KxMMcxBnQ0XjSYzsE=" }, "kparts": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kparts-6.9.0.tar.xz", - "hash": "sha256-r8nE6JezcaUViTQu0Fc4ib9Pq3m4G5ppUKRc2frt14g=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kparts-6.10.0.tar.xz", + "hash": "sha256-o8Rg9jXzLiVAk9o9RtU/6aSnzKWYcUkEeYG0d8UKBgw=" }, "kpeople": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kpeople-6.9.0.tar.xz", - "hash": "sha256-J+5bX4ZdMJN0pT1Aht7hTPTgL5ndmub65xp+PgKtdCI=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kpeople-6.10.0.tar.xz", + "hash": "sha256-qZHFOdeWTf2UeIn9P5suElnYwNPcaTwUwb382NKZcfA=" }, "kplotting": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kplotting-6.9.0.tar.xz", - "hash": "sha256-XhiD0QfeFszXonMjxVdbsewv7CLETJwxmbPeiF9cGPQ=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kplotting-6.10.0.tar.xz", + "hash": "sha256-aUHZMBm/semXfPpZK6EQ+/nDt/JHr0DzNuBABx+SLT8=" }, "kpty": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kpty-6.9.0.tar.xz", - "hash": "sha256-U1GwFYWt/plUJW2Td/5dluDJQ6qu63g1eiOPmEMEoj0=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kpty-6.10.0.tar.xz", + "hash": "sha256-H8zZLWfqwL/q2sO627QJ3Ncg7SJChO0FYWarV4fy1kc=" }, "kquickcharts": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kquickcharts-6.9.0.tar.xz", - "hash": "sha256-3xfDNq64heDVM5Fr9SEZEOTwhE+LzItFQj3ZoKAoOe8=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kquickcharts-6.10.0.tar.xz", + "hash": "sha256-ogNvex7nq7nCeMeCL8GHI9Zh2Fbanb+fAGzuvtcxWY8=" }, "krunner": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/krunner-6.9.0.tar.xz", - "hash": "sha256-60pe5zC41TZB2LCL3rjUuwZbGbbeP6KuklBDaCLwDYw=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/krunner-6.10.0.tar.xz", + "hash": "sha256-RZyXrVEMNWXUVHtRxNuvGbODTAr993v27k3/NGlX1is=" }, "kservice": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kservice-6.9.0.tar.xz", - "hash": "sha256-9P9XT0IrJ1dfBMdJFpQWLGHH20rZI1ZUCPojuafpZ18=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kservice-6.10.0.tar.xz", + "hash": "sha256-BK1ThQln44gi+K8WUrEYmSzRv6OC4nGCeLtt4DoL27M=" }, "kstatusnotifieritem": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kstatusnotifieritem-6.9.0.tar.xz", - "hash": "sha256-cwiiYVpgakTT6mU5JeNM+AOp9PTOo2NCclAk/O5jwIM=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kstatusnotifieritem-6.10.0.tar.xz", + "hash": "sha256-T6GYQ6c3tDZ00Zua0xRmxqpku+J3CQc8PiwzqgO/rCI=" }, "ksvg": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/ksvg-6.9.0.tar.xz", - "hash": "sha256-zNc24DKkCJ4dGy+Cm1VAf/0zOhg/jMoa1BGE5ouevNY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/ksvg-6.10.0.tar.xz", + "hash": "sha256-Fz4VH274NgFJ+DWx/HSU6Xoz+QVtKUqyE8nvnm2E0Mg=" }, "ktexteditor": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/ktexteditor-6.9.0.tar.xz", - "hash": "sha256-GxZg3GoH8h2Z/lSVlR8l8en2HbY/j1C8L2EEgrwVs8o=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/ktexteditor-6.10.0.tar.xz", + "hash": "sha256-P4DE/rhzfO+Dd14sefhgYMFq+J7otI4tcvlL3BoYC58=" }, "ktexttemplate": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/ktexttemplate-6.9.0.tar.xz", - "hash": "sha256-TF9sce4YlShal+EymmDGoNxfispIdZcPS990QvIRyKk=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/ktexttemplate-6.10.0.tar.xz", + "hash": "sha256-PjkZCtuQ1PcWcuM9EXs1/oSo81qqkKZ4hGQBBEiUqj0=" }, "ktextwidgets": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/ktextwidgets-6.9.0.tar.xz", - "hash": "sha256-2pZsbgHPsxJewxpNIUk3KhnRSBRBhp7On87ztwuzUU0=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/ktextwidgets-6.10.0.tar.xz", + "hash": "sha256-TbZ75w2mjj/SwqnTNZ3PubEeuCo08riNPm7QjjWKsHM=" }, "kunitconversion": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kunitconversion-6.9.0.tar.xz", - "hash": "sha256-6lesb6DMwi28vPhwV8q8gTp/eyWlz6Q0mCnQDhNL/Rw=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kunitconversion-6.10.0.tar.xz", + "hash": "sha256-I8WZBNSASd648d6KpW57DBCp/IKAjzajL09EZDOGnb8=" }, "kuserfeedback": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kuserfeedback-6.9.0.tar.xz", - "hash": "sha256-0SvsDAOW9YlCOneoqOPI5/3I6cuI7G6zWtl4oxJ65eg=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kuserfeedback-6.10.0.tar.xz", + "hash": "sha256-XdF9pxaampDIJ1dTbGZ9dI0ZCZhbl5ux4uUdqEoHNy8=" }, "kwallet": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kwallet-6.9.0.tar.xz", - "hash": "sha256-UjEeZWRFv24Wyu1RRomLLSMwncw1v9HOTJHAu9BAU3w=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kwallet-6.10.0.tar.xz", + "hash": "sha256-4Zk5EaFbQxjWSrzgrNwbX8WmEW3HWV7/ht3gOzXmvVA=" }, "kwidgetsaddons": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kwidgetsaddons-6.9.0.tar.xz", - "hash": "sha256-vafVzvMQrTuOCqmszzGcM0nit8vq1nO9JaOa9ZN4ekg=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kwidgetsaddons-6.10.0.tar.xz", + "hash": "sha256-4PpJQ9eHQof9LCwlTx7yHt9+VztrGTVN9f3vjLvv504=" }, "kwindowsystem": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kwindowsystem-6.9.0.tar.xz", - "hash": "sha256-mw+W+wBz97qJeIzVoQ+6b5YM6obrorAzNvpuMJ5eh1s=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kwindowsystem-6.10.0.tar.xz", + "hash": "sha256-BGt6oiR4ETI+SLYpiEuCSm/+xHXfIxYlbn/wud9neUQ=" }, "kxmlgui": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/kxmlgui-6.9.0.tar.xz", - "hash": "sha256-OSAlkseP5yKQPClciRoLWN0EEZM0YUEgAPVifLv6fYg=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/kxmlgui-6.10.0.tar.xz", + "hash": "sha256-Vh+nVWONoWyuIEtnD2L6twFWuRIbkxNhIjjKnJ6OEpI=" }, "modemmanager-qt": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/modemmanager-qt-6.9.0.tar.xz", - "hash": "sha256-39BgDZyT/tIp7Z4ATMoAGAz/8O0Qwb/U6yTYicLx0FY=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/modemmanager-qt-6.10.0.tar.xz", + "hash": "sha256-ZAo/lkh/Podeg++BXxThB3BCrp7oMnaz1/f8OHXi7hU=" }, "networkmanager-qt": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/networkmanager-qt-6.9.0.tar.xz", - "hash": "sha256-l9i1P2+HDnfpWvl2ka8eRjZzunsFRh6RwmqYAfOktFs=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/networkmanager-qt-6.10.0.tar.xz", + "hash": "sha256-L0N6trU0+33N5u1A69wsFoBTL3QrjjJupopHrlgXMZE=" }, "prison": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/prison-6.9.0.tar.xz", - "hash": "sha256-6EE1RzdWp7bN/LwCa0ZBEtwCwVhVDsMUmzCOBlp5hEM=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/prison-6.10.0.tar.xz", + "hash": "sha256-tKDzleylDIGPjgZWsEZkeDRTsamnCaSkWori4nNgLHs=" }, "purpose": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/purpose-6.9.0.tar.xz", - "hash": "sha256-FwmjHURue+QyF5t/zS7ibo47n94KOas1V4NWQ4c65Vg=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/purpose-6.10.0.tar.xz", + "hash": "sha256-Gd55Q993LBtc4ncQmaF1Nul+f/bFpUEcE0bCWyTlGlc=" }, "qqc2-desktop-style": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/qqc2-desktop-style-6.9.0.tar.xz", - "hash": "sha256-PpwGmOezkrERDAFtYyvOIbMvgeZa39ooW20B1tbrRGk=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/qqc2-desktop-style-6.10.0.tar.xz", + "hash": "sha256-nhlUD4+n0Oah/7HDU6JOjH+OKzeoWUOTr3pNXZ4OjlE=" }, "solid": { - "version": "6.9.1", - "url": "mirror://kde/stable/frameworks/6.9/solid-6.9.1.tar.xz", - "hash": "sha256-JU1WLaZhGhXx9hfnr7eNRwJFW4nKld4dup9rmSgyA2c=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/solid-6.10.0.tar.xz", + "hash": "sha256-JIkugaMEf3U1GdvThLR2NcWiVD2O4L88KZsPz+8xjow=" }, "sonnet": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/sonnet-6.9.0.tar.xz", - "hash": "sha256-FY84r0WWduz39du+OQFOv5v64pVXyhScHW/1V1ptYA0=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/sonnet-6.10.0.tar.xz", + "hash": "sha256-mcC8pWNZT9EV8x8YrTJkdwBGKQxmld7Q0qo8Lt2w1Lc=" }, "syndication": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/syndication-6.9.0.tar.xz", - "hash": "sha256-ZCZCxMB/2gvGMUywhgI3CxbCkPNEY9L0TUTw5aa/scI=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/syndication-6.10.0.tar.xz", + "hash": "sha256-p0PFJegG5fB7W3snz+NIghALIStNhG5mHGGieuE5YzA=" }, "syntax-highlighting": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/syntax-highlighting-6.9.0.tar.xz", - "hash": "sha256-1v0HAg7leRdRehwDvfNuZhsIPIRVxInPlK13qQ7CnHA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/syntax-highlighting-6.10.0.tar.xz", + "hash": "sha256-tbXjQ/8nvFyVvgBR1WBt/LMpX4NYMOf8bayNKGOJFpk=" }, "threadweaver": { - "version": "6.9.0", - "url": "mirror://kde/stable/frameworks/6.9/threadweaver-6.9.0.tar.xz", - "hash": "sha256-0kkYHSGqia1vUQjbOxiMJclBXJg0EQ+NFfa6st85wZA=" + "version": "6.10.0", + "url": "mirror://kde/stable/frameworks/6.10/threadweaver-6.10.0.tar.xz", + "hash": "sha256-E2pjajPM+po3Wi4e5QN2CgqRAAK5cr4O7yA1LrEGu4Q=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/drkonqi/default.nix b/pkgs/kde/plasma/drkonqi/default.nix index d9f097806899..965ba59b308d 100644 --- a/pkgs/kde/plasma/drkonqi/default.nix +++ b/pkgs/kde/plasma/drkonqi/default.nix @@ -4,7 +4,7 @@ systemd, gdb, python3, - substituteAll, + replaceVars, }: let gdb' = gdb.override { @@ -20,8 +20,7 @@ mkKdeDerivation { pname = "drkonqi"; patches = [ - (substituteAll { - src = ./gdb-path.patch; + (replaceVars ./gdb-path.patch { gdb = "${gdb'}/bin/gdb"; }) ]; diff --git a/pkgs/kde/plasma/kde-gtk-config/default.nix b/pkgs/kde/plasma/kde-gtk-config/default.nix index c9b5a827eea8..0ffc06da8451 100644 --- a/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, procps, xsettingsd, pkg-config, @@ -17,8 +17,7 @@ mkKdeDerivation { # aren't found. patches = [ ./0001-gsettings-schemas-path.patch - (substituteAll { - src = ./dependency-paths.patch; + (replaceVars ./dependency-paths.patch { pgrep = lib.getExe' procps "pgrep"; xsettingsd = lib.getExe xsettingsd; }) diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 8dd95c1a7659..dc8d7afcb1c0 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, openssl, pkg-config, qtkeychain, @@ -14,8 +14,7 @@ mkKdeDerivation { pname = "krdp"; patches = [ - (substituteAll { - src = ./hardcode-openssl-path.patch; + (replaceVars ./hardcode-openssl-path.patch { openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 46a0a73fb453..53c270cb5905 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -5,7 +5,7 @@ makeWrapper, glib, gsettings-desktop-schemas, - substituteAll, + replaceVars, util-linux, pkg-config, qtsvg, @@ -31,18 +31,15 @@ mkKdeDerivation { pname = "plasma-desktop"; patches = [ - (substituteAll { - src = ./hwclock-path.patch; + (replaceVars ./hwclock-path.patch { hwclock = "${lib.getBin util-linux}/bin/hwclock"; }) - (substituteAll { - src = ./kcm-access.patch; + (replaceVars ./kcm-access.patch { gsettings = "${gsettings-wrapper}/bin/gsettings"; }) ./tzdir.patch ./no-discover-shortcut.patch - (substituteAll { - src = ./wallpaper-paths.patch; + (replaceVars ./wallpaper-paths.patch { wallpapers = "${lib.getBin breeze}/share/wallpapers"; }) ]; diff --git a/pkgs/kde/plasma/plasma-disks/default.nix b/pkgs/kde/plasma/plasma-disks/default.nix index 5941fe0dec54..db687bcbb8de 100644 --- a/pkgs/kde/plasma/plasma-disks/default.nix +++ b/pkgs/kde/plasma/plasma-disks/default.nix @@ -1,16 +1,15 @@ { mkKdeDerivation, lib, - substituteAll, + replaceVars, smartmontools, }: mkKdeDerivation { pname = "plasma-disks"; patches = [ - (substituteAll { + (replaceVars ./smartctl-path.patch { smartctl = lib.getExe smartmontools; - src = ./smartctl-path.patch; }) ]; } diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index 6d93b623477b..3662452bad7b 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -1,6 +1,6 @@ { mkKdeDerivation, - substituteAll, + replaceVars, pkg-config, qtwebengine, mobile-broadband-provider-info, @@ -11,8 +11,7 @@ mkKdeDerivation { pname = "plasma-nm"; patches = [ - (substituteAll { - src = ./0002-openvpn-binary-path.patch; + (replaceVars ./0002-openvpn-binary-path.patch { inherit openvpn; }) ]; diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index d197dbcf5a60..66ae5758b0f8 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-lI3VaCd4eYhWbnYLEIeFiB88SWjd/DF8CUGFmxEXDXo="; + hash = "sha256-KAbOOOF8rMA6lwgn0gUQleh5EF7ISIvvi3OubuM/50w="; }; postPatch = '' diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch new file mode 100644 index 000000000000..09a64e1a3edd --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch @@ -0,0 +1,239 @@ +commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 +Author: Dimitry Andric +Date: Wed Jul 31 11:43:50 2024 +0200 + + Fix enum warning in ath_hal's ar9002 + + This fixes a clang 19 warning: + + sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] + 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ + + The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, + not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is + set to `AH_TRUE` whenever the related field `ah_antControl` is set to + `HAL_ANT_VARIABLE`. + + It is not entirely clear to me what the intended statement is here: the + test as it is written now compares the enum value 0 to `ah_diversity`, + so in effect it enables the following block whenever `ah_diversity` is + `AH_TRUE`. Write it like that, to avoid the compiler warning. + + MFC after: 3 days + +diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +index 01a224cbbfe9..fb2700771ffa 100644 +--- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c ++++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +@@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) + !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); + + if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || +- (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { ++ (AH5212(ah)->ah_diversity == AH_TRUE)) { + if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && + (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { + /* Enable antenna diversity */ +commit 82246ac5d890e031c9978052e5a431e0960182d5 +Author: Dimitry Andric +Date: Wed Jul 31 11:37:20 2024 +0200 + + Fix enum warnings in ath_hal's ar9300 + + This fixes a number of clang 19 warnings: + + sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:709:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] + 709 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' + 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) + | ~~~ ^ ~~~~~~~~~~~~~~~~~~ + sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:745:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] + 745 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' + 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) + | ~~~ ^ ~~~~~~~~~~~~~~~~~~ + sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:781:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] + 781 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' + 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) + | ~~~ ^ ~~~~~~~~~~~~~~~~~~ + + The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked + in most places around the `ath_hal` code with a (effectively) boolean + second argument, corresponding to "is this 2GHz?". But in the code that + is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different + non-boolean type, `HAL_FREQ_BAND`. + + Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the + second argument as boolean value, and rename the macro parameter names + to better describe their meaning. + + Reviewed by: adrian, bz + MFC after: 3 days + Differential Revision: https://reviews.freebsd.org/D46201 + +diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h +index 9230fd57e2e4..b2a0862c7aee 100644 +--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h ++++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h +@@ -142,10 +142,10 @@ enum Ar9300EepromTemplate + #define OSPREY_EEPMISC_WOW 0x02 + #define OSPREY_CUSTOMER_DATA_SIZE 20 + +-#define FREQ2FBIN(x,y) \ +- (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5)) +-#define FBIN2FREQ(x,y) \ +- (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) ++#define FREQ2FBIN(freq,is_2ghz) \ ++ (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5)) ++#define FBIN2FREQ(freq,is_2ghz) \ ++ ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq)) + #define OSPREY_MAX_CHAINS 3 + #define OSPREY_ANT_16S 25 + #define OSPREY_FUTURE_MODAL_SZ 6 +commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679 +Author: Dimitry Andric +Date: Wed Jul 31 13:14:17 2024 +0200 + + Fix enum warning in isci + + This fixes a clang 19 warning: + + sys/dev/isci/scil/scif_sas_smp_remote_device.c:197:26: error: comparison of different enumeration types ('SCI_IO_STATUS' (aka 'enum _SCI_IO_STATUS') and 'enum _SCI_STATUS') [-Werror,-Wenum-compare] + 197 | if (completion_status == SCI_FAILURE_RETRY_REQUIRED) + | ~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ + + The `completion_status` variable is of type `SCI_IO_STATUS`, not + `SCI_STATUS`. In this case, we can seamlessly replace the value with + `SCI_IO_FAILURE_RETRY_REQUIRED`, which is numerically equal to + `SCI_FAILURE_RETRY_REQUIRED`. + + MFC after: 3 days + +diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c +index d6055adc13f9..c72402f66889 100644 +--- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c ++++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c +@@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response( + + //if Core set the status of this io to be RETRY_REQUIRED, we should + //retry the IO without even decode the response. +- if (completion_status == SCI_FAILURE_RETRY_REQUIRED) ++ if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED) + { + scif_sas_smp_remote_device_continue_current_activity( + fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED +commit 357378bbdedf24ce2b90e9bd831af4a9db3ec70a +Author: Dimitry Andric +Date: Wed Jul 31 14:21:25 2024 +0200 + + Fix enum warnings in qat + + This fixes a number of clang 19 warnings: + + sys/dev/qat/qat_api/common/compression/dc_session.c:154:15: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare] + 154 | if (CPA_TRUE == pService->comp_device_data.enableDmm) { + | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + sys/dev/qat/qat_api/common/compression/dc_session.c:285:17: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare] + 285 | (CPA_TRUE == pService->comp_device_data.enableDmm) ? + | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + The `enableDmm` field of variable `comp_device_data` is of type + `icp_qat_hw_compression_delayed_match_t`, not `CpaBoolean`. In this + case, we can seamlessly replace the value with + `ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED`, which is numerically + equal to `CPA_TRUE`. + + MFC after: 3 days + +diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c +index c92d6eebdc47..60f4410dac32 100644 +--- a/sys/dev/qat/qat_api/common/compression/dc_session.c ++++ b/sys/dev/qat/qat_api/common/compression/dc_session.c +@@ -151,7 +151,8 @@ dcCompHwBlockPopulate(sal_compression_service_t *pService, + } + + /* Set delay match mode */ +- if (CPA_TRUE == pService->comp_device_data.enableDmm) { ++ if (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == ++ pService->comp_device_data.enableDmm) { + dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED; + } else { + dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_DISABLED; +@@ -282,7 +283,8 @@ dcCompHwBlockPopulateGen4(sal_compression_service_t *pService, + hw_comp_lower_csr.hash_update = + ICP_QAT_HW_COMP_20_SKIP_HASH_UPDATE_DONT_ALLOW; + hw_comp_lower_csr.edmm = +- (CPA_TRUE == pService->comp_device_data.enableDmm) ? ++ (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == ++ pService->comp_device_data.enableDmm) ? + ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_ENABLED : + ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_DISABLED; + +commit 67be1e195acfaec99ce4fffeb17111ce085755f7 +Author: Dimitry Andric +Date: Wed Jul 31 13:01:20 2024 +0200 + + Fix enum warning in iavf + + This fixes a clang 19 warning: + + sys/dev/iavf/iavf_lib.c:514:39: error: comparison of different enumeration types ('enum virtchnl_vsi_type' and 'enum iavf_vsi_type') [-Werror,-Wenum-compare] + 514 | if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ + + The `vsi_type` field of `struct virtchnl_vsi_resource` is of type `enum + virtchnl_vsi_type`, not `enum iavf_vsi_type`. In this case, we can + seamlessly replace the value with `VIRTCHNL_VSI_SRIOV`, which is + numerically equal to `IAVF_VSI_SRIOV`. + + MFC after: 3 days + +diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c +index 883a722b3a03..f80e3765448f 100644 +--- a/sys/dev/iavf/iavf_lib.c ++++ b/sys/dev/iavf/iavf_lib.c +@@ -511,7 +511,7 @@ iavf_get_vsi_res_from_vf_res(struct iavf_sc *sc) + + for (int i = 0; i < sc->vf_res->num_vsis; i++) { + /* XXX: We only use the first VSI we find */ +- if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) ++ if (sc->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV) + sc->vsi_res = &sc->vf_res->vsi_res[i]; + } + if (!sc->vsi_res) { +commit 6f25b46721a18cf4f036d041e7e5d275800a00b3 +Author: Dimitry Andric +Date: Tue Jul 30 20:31:47 2024 +0200 + + Fix enum warning in heimdal + + This fixes a clang 19 warning: + + crypto/heimdal/lib/krb5/deprecated.c:75:17: error: comparison of different enumeration types ('krb5_keytype' (aka 'enum ENCTYPE') and 'enum krb5_keytype_old') [-Werror,-Wenum-compare] + 75 | if (keytype != KEYTYPE_DES || context->etypes_des == NULL) + | ~~~~~~~ ^ ~~~~~~~~~~~ + + In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved + by adding a cast. That commit is rather large, so I'm only applying the + one-liner here. + + MFC after: 3 days + +diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c +index e7c0105ebf7f..02cf7614f932 100644 +--- a/crypto/heimdal/lib/krb5/deprecated.c ++++ b/crypto/heimdal/lib/krb5/deprecated.c +@@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context, + unsigned int i, n; + krb5_enctype *ret; + +- if (keytype != KEYTYPE_DES || context->etypes_des == NULL) ++ if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL) + return krb5_keytype_to_enctypes (context, keytype, len, val); + + for (n = 0; context->etypes_des[n]; ++n) diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch new file mode 100644 index 000000000000..5bc224eaa97e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch @@ -0,0 +1,25 @@ +commit d575077527d448ee45b923fa8c6b0cb7216ca5c5 +Author: Dimitry Andric +Date: Tue Jul 30 20:28:51 2024 +0200 + + bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for + -Wcast-function-type-mismatch. + + PR: 280562 + MFC after: 1 month + +diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk +index 52c3d07746c7..1934a79a5427 100644 +--- a/share/mk/bsd.sys.mk ++++ b/share/mk/bsd.sys.mk +@@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable + .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 + CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter + .endif ++.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 ++# Similar to gcc >= 8.1 -Wno-error=cast-function-type below ++CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch ++.endif + .endif # WARNS <= 6 + .if ${WARNS} <= 3 + CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index 961b31d0720a..12824de8472a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -11,6 +11,7 @@ freebsd-lib, expat, zlib, + extraSrc ? [ ], }: let @@ -115,7 +116,8 @@ mkDerivation { # idk bro "sys/sys/kbio.h" - ]; + ] + ++ extraSrc; preBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/init.nix b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix index 842bc80461fd..e8edcd6c87a2 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/init.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix @@ -6,7 +6,6 @@ mkDerivation { path = "sbin/init"; extraPaths = [ "sbin/mount" ]; - NO_FSCHG = "yes"; MK_TESTS = "no"; meta = { diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix index 9da5df30df53..39cd09024fae 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix @@ -6,6 +6,7 @@ byacc, gencat, csu, + extraSrc ? [ ], }: mkDerivation { @@ -31,7 +32,7 @@ mkDerivation { "etc/group" "etc/master.passwd" "etc/shells" - ]; + ] ++ extraSrc; outputs = [ "out" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix index a2ff458274e2..0062dac44d87 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix @@ -13,15 +13,17 @@ # this is set to true when used as the dependency of install # this is set to false when used as the dependency of libc bootstrapInstallation ? false, + extraSrc ? [ ], }: mkDerivation ( { + pname = "libmd" + lib.optionalString bootstrapInstallation "-boot"; path = "lib/libmd"; extraPaths = [ "sys/crypto" "sys/sys" - ]; + ] ++ extraSrc; outputs = [ "out" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix index 15c7729919d4..69c23fca74a4 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix @@ -7,6 +7,7 @@ libutil, libelf, csu, + extraSrc ? [ ], }: mkDerivation { @@ -17,7 +18,7 @@ mkDerivation { "sys/contrib/pcg-c" "sys/opencrypto" "sys/crypto" - ]; + ] ++ extraSrc; outputs = [ "out" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix index f8f4e3e5978e..15d2358da990 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix @@ -4,6 +4,7 @@ include, libgcc, csu, + extraSrc ? [ ], }: mkDerivation { @@ -12,7 +13,7 @@ mkDerivation { "lib/libthread_db" "lib/libc" # needs /include + arch-specific files "libexec/rtld-elf" - ]; + ] ++ extraSrc; outputs = [ "out" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix index 1a9aba91c252..34bf582b86ed 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix @@ -5,6 +5,7 @@ flex, byacc, csu, + extraSrc ? [ ], }: mkDerivation { @@ -26,7 +27,7 @@ mkDerivation { "sys/kern" "sys/libkern" "sys/crypto" - ]; + ] ++ extraSrc; outputs = [ "out" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/package.nix index 3a6b0ff00428..4e7915c733e1 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/package.nix @@ -1,9 +1,12 @@ -{ substituteAll, runtimeShell }: +{ replaceVarsWith, runtimeShell }: -substituteAll { +replaceVarsWith { name = "xargs-j"; - shell = runtimeShell; src = ./xargs-j.sh; dir = "bin"; isExecutable = true; + + replacements = { + inherit runtimeShell; + }; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/xargs-j.sh b/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/xargs-j.sh index 3dd27c2cd2cd..be3d5f852cec 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/xargs-j.sh +++ b/pkgs/os-specific/bsd/freebsd/pkgs/xargs-j/xargs-j.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ declare -a args=() diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index 937f5a5a14ca..134002567ecd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -5,6 +5,7 @@ fixDarwinDylibNames, mkAppleDerivation, python3, + stdenv, # Necessary for compatibility with python3Packages.tensorflow, which tries to override the stdenv testers, }: @@ -24,11 +25,18 @@ let sourceRoot = "source/icu/icu4c/source"; patches = [ + # Apple defaults to `uint16_t` for compatibility with building one of their private frameworks, + # but nixpkgs needs `char16_t` for compatibility with packages that expect upstream ICU with `char16_t`. + # According to `unicode/umachine.h`, these types are bit-compatible but distinct in C++. + ./patches/define-uchar-as-char16_t.patch + # Enable the C++ API by default to match the upstream ICU packaging in nixpkgs + ./patches/enable-cxx-api-by-default.patch # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. ./patches/suppress-icu-check-crash.patch ]; preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure patchShebangs --build . # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch new file mode 100644 index 000000000000..65437d4cb5f2 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch @@ -0,0 +1,53 @@ +diff --git a/icu/icu4c/source/common/unicode/umachine.h b/icu/icu4c/source/common/unicode/umachine.h +index 9483031569..e451ad7c02 100644 +--- a/common/unicode/umachine.h ++++ b/common/unicode/umachine.h +@@ -387,39 +387,6 @@ + * @stable ICU 4.4 + */ + +-#if APPLE_ICU_CHANGES +-// rdar://121241618 (StarlightE: VideosUI-883.40.54#24 has failed to build in install; cannot initialize a variable of type 'const UChar *' (aka 'const char16_t) +-#if 0 +- // #if 1 is normal (Apple uses 0 to force us to still use uint16_t). UChar defaults to char16_t in C++. +- // For configuration testing of UChar=uint16_t temporarily change this to #if 0. +- // The intltest Makefile #defines UCHAR_TYPE=char16_t, +- // so we only #define it to uint16_t if it is undefined so far. +-#elif !defined(UCHAR_TYPE) +-# define UCHAR_TYPE uint16_t +-#endif +- +-#if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \ +- defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || \ +- defined (U_TOOLUTIL_IMPLEMENTATION) +- // Inside the ICU library code, never configurable. +- typedef char16_t UChar; +-#elif defined(T_CTEST_IMPLEMENTATION) +- // internally to ctestfw, we want to use char16_t in C++ and uint_16 in C +- #if U_CPLUSPLUS_VERSION != 0 +- typedef char16_t UChar; // C++ +- #else +- typedef uint16_t UChar; // C +- #endif +-#elif defined(UCHAR_TYPE) +- typedef UCHAR_TYPE UChar; +-#elif U_CPLUSPLUS_VERSION != 0 +- typedef char16_t UChar; // C++ +-#else +- typedef uint16_t UChar; // C +-#endif +- +-#else +- + #if 1 + // #if 1 is normal. UChar defaults to char16_t in C++. + // For configuration testing of UChar=uint16_t temporarily change this to #if 0. +@@ -441,8 +408,6 @@ + typedef uint16_t UChar; // C + #endif + +-#endif // APPLE_ICU_CHANGES +- + /** + * \var OldUChar + * Default ICU 58 definition of UChar. diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch new file mode 100644 index 000000000000..3b324aeca4ec --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch @@ -0,0 +1,54 @@ +diff --git a/icu/icu4c/source/common/unicode/utypes.h b/icu/icu4c/source/common/unicode/utypes.h +index a3e0ec911c..e361c658ef 100644 +--- a/common/unicode/utypes.h ++++ b/common/unicode/utypes.h +@@ -66,20 +66,6 @@ + * \def U_SHOW_CPLUSPLUS_API + * @internal + */ +-#if APPLE_ICU_CHANGES +-// rdar://60884991 #58 Replace installsrc patching with changes directly in header files +-// Apple modifies the default to be 0, not 1 +-#ifdef __cplusplus +-# ifndef U_SHOW_CPLUSPLUS_API +-# define U_SHOW_CPLUSPLUS_API 0 +-# endif +-#else +-# undef U_SHOW_CPLUSPLUS_API +-# define U_SHOW_CPLUSPLUS_API 0 +-#endif +- +-#else +- + #ifdef __cplusplus + # ifndef U_SHOW_CPLUSPLUS_API + # define U_SHOW_CPLUSPLUS_API 1 +@@ -89,28 +75,6 @@ + # define U_SHOW_CPLUSPLUS_API 0 + #endif + +-#endif // APPLE_ICU_CHANGES +- +- +-#if APPLE_ICU_CHANGES +-// rdar://30624081 64b8ed9b89.. Add #if U_SHOW_CPLUSPLUS_API..#endif around C++ interfaces that don’t have it +-// rdar://24075048 0f5f76d43c.. update ICU for AAS to use VS2015, remove old ICU 4.0 shims, fix build issues +-/* +- * Apple-specific warning if U_SHOW_CPLUSPLUS_API set and the compile +- * is not for a build of ICU itself (ICU_DATA_DIR is always defined +- * for ICU builds, and is unlikely to be defined for client builds). +- * Windows VSC compliler does not like #warning, skip for it. +- */ +-#if U_SHOW_CPLUSPLUS_API +-#ifndef ICU_DATA_DIR +-#if U_PLATFORM!=U_PF_WINDOWS +-#warning Do not set U_SHOW_CPLUSPLUS_API for code that ships with the OS, it is only for local tools. +-#warning ICU C++ functionality may not be used by any OS client, it is not binary compatible across updates. +-#endif +-#endif +-#endif +-#endif // APPLE_ICU_CHANGES +- + /** @{ API visibility control */ + + /** diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix new file mode 100644 index 000000000000..b3c38b7da971 --- /dev/null +++ b/pkgs/os-specific/linux/ajantv2/default.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + libajantv2, +}: +stdenv.mkDerivation { + name = "ajantv2-module-${libajantv2.version}-${kernel.version}"; + + inherit (libajantv2) src; + sourceRoot = "source/driver/linux"; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + preBuild = '' + chmod -R +w ../../ + ''; + + enableParallelBuilding = true; + + buildFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D ajantv2.ko $out/lib/modules/${kernel.modDirVersion}/misc/ajantv2.ko + install -D ajardma.ko $out/lib/modules/${kernel.modDirVersion}/misc/ajardma.ko + ''; + + meta = { + inherit (libajantv2.meta) license homepage maintainers; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + description = "AJA video driver"; + }; +} diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 6f3b95dc6418..722965fed1e1 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -143,13 +143,13 @@ in linuxHeaders = let - version = "6.12"; + version = "6.12.7"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-saJWK+VuQq+z+EidTCp6xHKsIwmPHvHB5A2mAfVGJes="; + hash = "sha256-94X7ZIoOC2apQ7syKKS27WLJC5hc0ev2naXTjlidoM8="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1a98db7e0253..4c9e256a8dcb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -89,7 +89,9 @@ let # Enable CPU lockup detection LOCKUP_DETECTOR = yes; SOFTLOCKUP_DETECTOR = yes; - HARDLOCKUP_DETECTOR = yes; + HARDLOCKUP_DETECTOR = lib.mkIf ( + with stdenv.hostPlatform; isPower || isx86 || lib.versionAtLeast version "6.5" + ) yes; # Enable streaming logs to a remote device over a network NETCONSOLE = module; @@ -106,6 +108,7 @@ let { CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes; CPU_FREQ_GOV_SCHEDUTIL = yes; + PM_DEBUG = yes; PM_ADVANCED_DEBUG = yes; PM_WAKELOCKS = yes; POWERCAP = yes; @@ -213,7 +216,7 @@ let MEMORY_FAILURE = yes; # Collect ECC errors and retire pages that fail too often - RAS_CEC = yes; + RAS_CEC = lib.mkIf stdenv.hostPlatform.isx86 yes; } // lib.optionalAttrs (stdenv.hostPlatform.is32bit) { # Enable access to the full memory range (aka PAE) on 32-bit architectures @@ -282,6 +285,7 @@ let CGROUP_BPF = option yes; CGROUP_NET_PRIO = yes; # Required by systemd IP_ROUTE_VERBOSE = yes; + IP_MROUTE = yes; IP_MROUTE_MULTIPLE_TABLES = yes; IP_MULTICAST = yes; IP_MULTIPLE_TABLES = yes; @@ -431,7 +435,7 @@ let FB_SIS_300 = yes; FB_SIS_315 = yes; FB_3DFX_ACCEL = yes; - FB_VESA = yes; + FB_VESA = lib.mkIf stdenv.hostPlatform.isx86 yes; FRAMEBUFFER_CONSOLE = yes; FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; @@ -457,7 +461,7 @@ let in { # compile in DRM so simpledrm can load before initrd if necessary - AGP = yes; + AGP = lib.mkIf (with stdenv.hostPlatform; isPower || isx86) yes; DRM = yes; DRM_LEGACY = whenOlder "6.8" no; @@ -474,11 +478,11 @@ let # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; - VGA_SWITCHEROO = yes; # Hybrid graphics support - DRM_GMA500 = whenAtLeast "5.12" module; - DRM_GMA600 = whenOlder "5.13" yes; - DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = whenOlder "6.1" yes; + VGA_SWITCHEROO = lib.mkIf stdenv.hostPlatform.isx86 yes; # Hybrid graphics support + DRM_GMA500 = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" module); + DRM_GMA600 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.13" yes); + DRM_GMA3600 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.12" yes); + DRM_VMWGFX_FBCON = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.1" yes); # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -490,8 +494,10 @@ let DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes; DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes; DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes; - DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; - DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes; + DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenBetween "5.9" "5.11" yes); + DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) ( + whenBetween "5.11" "6.4" yes + ); DRM_AMD_DC_FP = whenAtLeast "6.4" yes; DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes; DRM_AMD_DC_SI = whenAtLeast "5.10" yes; @@ -500,7 +506,13 @@ let DRM_AMD_ACP = yes; # Enable AMD secure display when available - DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes; + DRM_AMD_SECURE_DISPLAY = lib.mkIf ( + with stdenv.hostPlatform; + (lib.versionAtLeast version "5.13" && (isx86 || isPower64)) + || (lib.versionAtLeast version "6.2" && isAarch64 && !stdenv.cc.isClang) + || (lib.versionAtLeast version "6.5" && isLoongArch64 && !stdenv.cc.isClang) + || (lib.versionAtLeast version "6.10" && isRiscV64 && !stdenv.cc.isClang) + ) yes; # Enable AMD image signal processor DRM_AMD_ISP = whenAtLeast "6.11" yes; @@ -680,6 +692,7 @@ let NFSD_V4 = yes; NFSD_V4_SECURITY_LABEL = yes; + NFS_FS = module; NFS_FSCACHE = yes; NFS_SWAP = yes; NFS_V3_ACL = yes; @@ -747,7 +760,7 @@ let # This does not have any effect if a program does not support it SECURITY_LANDLOCK = whenAtLeast "5.13" yes; - DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem + DEVKMEM = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenOlder "5.13" no); # Disable /dev/kmem USER_NS = yes; # Support for user namespaces @@ -828,9 +841,9 @@ let }; microcode = { - MICROCODE = yes; - MICROCODE_INTEL = whenOlder "6.6" yes; - MICROCODE_AMD = whenOlder "6.6" yes; + MICROCODE = lib.mkIf stdenv.hostPlatform.isx86 yes; + MICROCODE_INTEL = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.6" yes); + MICROCODE_AMD = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.6" yes); # Write Back Throttling # https://lwn.net/Articles/682582/ # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655 @@ -891,12 +904,12 @@ let virtualisation = { PARAVIRT = option yes; - HYPERVISOR_GUEST = yes; + HYPERVISOR_GUEST = lib.mkIf stdenv.hostPlatform.isx86 yes; PARAVIRT_SPINLOCKS = option yes; - KVM_ASYNC_PF = yes; + KVM_ASYNC_PF = lib.mkIf (with stdenv.hostPlatform; isS390 || isx86) yes; KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes; - KVM_GUEST = yes; + KVM_GUEST = lib.mkIf (with stdenv.hostPlatform; isPower || isx86) yes; KVM_MMIO = yes; KVM_VFIO = yes; KSM = yes; @@ -907,7 +920,7 @@ let tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y"; }; - VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.is64bit yes; + VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.isx86_64 yes; UDMABUF = yes; @@ -1017,7 +1030,7 @@ let # Allows soft-dirty tracking on pages, used by CRIU. # See https://docs.kernel.org/admin-guide/mm/soft-dirty.html - MEM_SOFT_DIRTY = lib.mkIf (!stdenv.hostPlatform.isx86_32) yes; + MEM_SOFT_DIRTY = lib.mkIf (with stdenv.hostPlatform; isS390 || isPower64 || isx86_64) yes; }; misc = @@ -1030,7 +1043,11 @@ let # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V. KERNEL_UNCOMPRESSED = lib.mkIf stdenv.hostPlatform.isRiscV yes; KERNEL_XZ = lib.mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes; - KERNEL_ZSTD = lib.mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes; + KERNEL_ZSTD = lib.mkIf ( + with stdenv.hostPlatform; + (isMips || isS390 || isx86 || (lib.versionAtLeast version "6.1" && isAarch64 || isLoongArch64)) + && useZstd + ) yes; HID_BATTERY_STRENGTH = yes; # enabled by default in x86_64 but not arm64, so we do that here @@ -1043,6 +1060,7 @@ let DRAGONRISE_FF = yes; GREENASIA_FF = yes; HOLTEK_FF = yes; + INPUT_JOYSTICK = yes; JOYSTICK_PSXPAD_SPI_FF = yes; LOGIG940_FF = yes; NINTENDO_FF = whenAtLeast "5.16" yes; @@ -1072,8 +1090,7 @@ let BLK_DEV_INITRD = yes; # Allows debugging systems that get stuck during suspend/resume - PM_TRACE = yes; - PM_TRACE_RTC = yes; + PM_TRACE_RTC = lib.mkIf stdenv.hostPlatform.isx86 yes; ACCESSIBILITY = yes; # Accessibility support AUXDISPLAY = yes; # Auxiliary Display support @@ -1145,13 +1162,15 @@ let POSIX_MQUEUE = yes; FRONTSWAP = whenOlder "6.6" yes; FUSION = yes; # Fusion MPT device support - IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 + IDE = lib.mkIf (with stdenv.hostPlatform; isAarch32 || isM68k || isMips || isPower || isx86) ( + whenOlder "5.14" no + ); # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED - KEYBOARD_APPLESPI = module; + KEYBOARD_APPLESPI = lib.mkIf stdenv.hostPlatform.isx86 module; KEXEC_FILE = option yes; KEXEC_JUMP = option yes; @@ -1187,16 +1206,16 @@ let MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension - MOUSE_PS2_VMMOUSE = yes; - MTRR_SANITIZER = yes; + MOUSE_PS2_VMMOUSE = lib.mkIf stdenv.hostPlatform.isx86 yes; + MTRR_SANITIZER = lib.mkIf stdenv.hostPlatform.isx86 yes; NET_FC = yes; # Fibre Channel driver support # Needed for touchpads to work on some AMD laptops PINCTRL_AMD = whenAtLeast "5.19" yes; # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks - PINCTRL_BAYTRAIL = yes; + PINCTRL_BAYTRAIL = lib.mkIf stdenv.hostPlatform.isx86 yes; # GPIO for Braswell and Cherryview devices # Needs to be built-in to for integrated keyboards to function properly - PINCTRL_CHERRYVIEW = yes; + PINCTRL_CHERRYVIEW = lib.mkIf stdenv.hostPlatform.isx86 yes; # 8 is default. Modern gpt tables on eMMC may go far beyond 8. MMC_BLOCK_MINORS = freeform "32"; @@ -1225,8 +1244,8 @@ let UEVENT_HELPER = no; USERFAULTFD = yes; - X86_CHECK_BIOS_CORRUPTION = yes; - X86_MCE = yes; + X86_CHECK_BIOS_CORRUPTION = lib.mkIf stdenv.hostPlatform.isx86 yes; + X86_MCE = lib.mkIf stdenv.hostPlatform.isx86 yes; RAS = yes; # Needed for EDAC support @@ -1255,9 +1274,9 @@ let PREEMPT = no; PREEMPT_VOLUNTARY = yes; - X86_AMD_PLATFORM_DEVICE = yes; - X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; - X86_PLATFORM_DRIVERS_HP = whenAtLeast "6.1" yes; + X86_AMD_PLATFORM_DEVICE = lib.mkIf stdenv.hostPlatform.isx86 yes; + X86_PLATFORM_DRIVERS_DELL = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" yes); + X86_PLATFORM_DRIVERS_HP = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "6.1" yes); LIRC = yes; @@ -1323,6 +1342,7 @@ let ACPI_HOTPLUG_CPU = yes; ACPI_HOTPLUG_MEMORY = yes; MEMORY_HOTPLUG = yes; + MEMORY_HOTPLUG_DEFAULT_ONLINE = yes; MEMORY_HOTREMOVE = yes; HOTPLUG_CPU = yes; MIGRATION = yes; @@ -1341,8 +1361,6 @@ let CROS_EC = module; CROS_EC_I2C = module; CROS_EC_SPI = module; - CROS_EC_LPC = module; - CROS_EC_ISHTP = module; CROS_KBD_LED_BACKLIGHT = module; TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes; } @@ -1364,7 +1382,7 @@ let # Add debug interfaces for CMA CMA_DEBUGFS = yes; - CMA_SYSFS = yes; + CMA_SYSFS = whenAtLeast "5.13" yes; # https://docs.kernel.org/arch/arm/mem_alignment.html # tldr: @@ -1399,6 +1417,9 @@ let CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes; } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + CROS_EC_LPC = module; + CROS_EC_ISHTP = module; + CHROMEOS_LAPTOP = module; CHROMEOS_PSTORE = module; diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 7e12ca5d96a9..57d3ab739cb6 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -41,7 +41,13 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX} $makeFlags"); + # + # We have to pass through the target toolchain, because `make config` checks them for versions. This is + # required to get clang LTO working, among other things. + my $pid = open2(\*IN, \*OUT, + "make -C $ENV{SRC} O=$buildRoot config" + . " SHELL=bash ARCH=$ENV{ARCH} CROSS_COMPILE=$ENV{CROSS_COMPILE}" + . " $makeFlags"); # Parse the output, look for questions and then send an # appropriate answer. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 06a9f7322889..fe6b1b8f0f98 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -60,7 +60,8 @@ lib.makeOverridable ({ # The kernel source tarball. # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" +, ignoreConfigErrors ? + !lib.elem stdenv.hostPlatform.linux-kernel.name [ "aarch64-multiplatform" "pc" ] , extraMeta ? {} , isZen ? false @@ -171,23 +172,18 @@ let buildPhase = '' export buildRoot="''${buildRoot:-build}" - export HOSTCC=$CC_FOR_BUILD - export HOSTCXX=$CXX_FOR_BUILD - export HOSTAR=$AR_FOR_BUILD - export HOSTLD=$LD_FOR_BUILD # Get a basic config file for later refinement with $generateConfig. make $makeFlags \ -C . O="$buildRoot" $kernelBaseConfig \ - ARCH=$kernelArch \ - HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ - CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ + ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \ $makeFlags # Create the config file. echo "generating kernel configuration..." ln -s "$kernelConfigPath" "$buildRoot/kernel-config" - DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ + DEBUG=1 ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \ + KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ perl -w $generateConfig ''; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index e04b6d878993..85c5fb47191c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -109,5 +109,5 @@ assert (lib.versionAtLeast version "4.9"); IOMMU_DEFAULT_DMA_LAZY = option no; # not needed for less than a decade old glibc versions - LEGACY_VSYSCALL_NONE = yes; + LEGACY_VSYSCALL_NONE = lib.mkIf stdenv.hostPlatform.isx86 yes; } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2907a1b06258..8f7975b4746d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120" }, "6.1": { - "version": "6.1.125", - "hash": "sha256:0g0b23dm8kzijh9j1g4rv7b3r2lzz53g26xmz4zgchkybxfkbwnr" + "version": "6.1.126", + "hash": "sha256:140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9" }, "5.15": { "version": "5.15.176", diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 522eb4608764..d5722bbbd6f4 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -433,12 +433,14 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat # Absolute paths for compilers avoid any PATH-clobbering issues. makeFlags = [ "O=$(buildRoot)" - "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" - "HOSTLD=${buildPackages.stdenv.cc.bintools}/bin/${buildPackages.stdenv.cc.targetPrefix}ld" "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] ++ lib.optionals (stdenv.isx86_64 && stdenv.cc.bintools.isLLVM) [ + # The wrapper for ld.lld breaks linking the kernel. We use the + # unwrapped linker as workaround. See: + # + # https://github.com/NixOS/nixpkgs/issues/321667 + "LD=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ld" ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) ++ extraMakeFlags; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 8c8adfb5e124..db898b6317a8 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.7"; + version = "1.5.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-iknPdJ1vJ5y1ncsHx+nAc6gmvJWbo1Wg6mFTfa2KDBM="; + hash = "sha256-+L/rbp0a3p4PHq1yTJmuMcNj0gT5sqAPeaNRo3Sh6U8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index aa02aeb10457..558f54afadd8 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.28"; - hash = "sha256-uCK6/2ti3zY4LHF866mKJojrsxvyt2jz/6K21eJVckI="; + version = "2.03.29"; + hash = "sha256-MMU3dstN32v57KKdDCjb+cWsFwwJFUMhITsRw9u1vpw="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 830464053a05..f24612acbca6 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" - ] ++ lib.optionals (!enableCmdlib) [ + ] ++ lib.optionals (!enableCmdlib && !onlyLib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { ]; installPhase = lib.optionalString onlyLib '' - install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"} + make -C libdm install_${if stdenv.hostPlatform.isStatic then "static" else "dynamic"} make -C libdm install_include make -C libdm install_pkgconfig ''; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 8c6906098b31..7fbd2b0bc52d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -34,6 +34,14 @@ stdenv.mkDerivation rec { hash = "sha256-Y1iDDzpk8x45sK1CHX2tzSQLcjQ97UjY7xO4+vIEhlo="; }; + patches = [ + (fetchurl { + name = "musl.patch"; + url = "https://lore.kernel.org/netfilter-devel/20241219231001.1166085-2-hi@alyssa.is/raw"; + hash = "sha256-7vMBIoDWcI/JBInYP5yYWp8BnYbATRfMTxqyZr2L9Sk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 00f38b0a3042..8e5f554b512a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,6 +1,3 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - unpackManually() { skip=$(sed 's/^skip=//; t; d' $src) tail -n +$skip $src | bsdtar xvf - diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 1b17349f33d8..9d5ce46533e2 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVarsWith, }: # Provides a facility to hook into rfkill changes. @@ -29,8 +29,8 @@ # in the rfkill package. let - rfkillHook = substituteAll { - inherit (stdenv) shell; + rfkillHook = replaceVarsWith { + replacements = { inherit (stdenv) shell; }; isExecutable = true; src = ./rfkill-hook.sh; }; diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 9dd9344a831f..d242ff7c9287 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -13,10 +13,10 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index ad0c7e2fb5..79f3086e78 100644 +index 882cda0dcd..8e8d1f04ce 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in -@@ -26,10 +26,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE +@@ -30,10 +30,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE # Import previous SYSTEMD_READY state. SUBSYSTEM=="block", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}=="", IMPORT{db}="SYSTEMD_READY" diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 6adbe5d6f68d..d6a64437c2ac 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -14,7 +14,7 @@ Original-Author: Eelco Dolstra 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index eac5bb8d3b..d8187bfa99 100644 +index d6a256c4a7..f74d5198f1 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -66,6 +66,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -27,7 +27,7 @@ index eac5bb8d3b..d8187bfa99 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index ca6d36e054..0a9227c9a8 100644 +index 4bc01c75e0..ede9ac7b87 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -170,8 +170,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) { diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 68bb9914e40e..23029da39f23 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 4fee8a693c..756ce11b1f 100644 +index 500725d35f..2b735e4df4 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -6028,6 +6028,7 @@ static int run(int argc, char *argv[]) { +@@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,8 +21,8 @@ index 4fee8a693c..756ce11b1f 100644 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -6044,6 +6045,7 @@ static int run(int argc, char *argv[]) { - "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); +@@ -6208,6 +6209,7 @@ static int run(int argc, char *argv[]) { + log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory); goto finish; } +#endif diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch index 46623e87e8c3..2657eb9089d1 100644 --- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch @@ -11,93 +11,12 @@ Also, remove /usr and /lib as these don't exist on NixOS. Original-Author: Eelco Dolstra --- - src/basic/path-lookup.c | 18 ++---------------- - src/core/systemd.pc.in | 8 ++++---- - 2 files changed, 6 insertions(+), 20 deletions(-) + src/core/systemd.pc.in | 8 ++++---- + src/libsystemd/sd-path/path-lookup.c | 20 +++----------------- + 2 files changed, 7 insertions(+), 21 deletions(-) -diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 540256b73b..a115ec09a3 100644 ---- a/src/basic/path-lookup.c -+++ b/src/basic/path-lookup.c -@@ -123,11 +123,7 @@ int runtime_directory(char **ret, RuntimeScope scope, const char *suffix) { - } - - static const char* const user_data_unit_paths[] = { -- "/usr/local/lib/systemd/user", -- "/usr/local/share/systemd/user", - USER_DATA_UNIT_DIR, -- "/usr/lib/systemd/user", -- "/usr/share/systemd/user", - NULL - }; - -@@ -634,16 +630,13 @@ int lookup_paths_init( - persistent_config, - SYSTEM_CONFIG_UNIT_DIR, - "/etc/systemd/system", -+ "/nix/var/nix/profiles/default/lib/systemd/system", - STRV_IFNOTNULL(persistent_attached), - runtime_config, - "/run/systemd/system", - STRV_IFNOTNULL(runtime_attached), - STRV_IFNOTNULL(generator), -- "/usr/local/lib/systemd/system", - SYSTEM_DATA_UNIT_DIR, -- "/usr/lib/systemd/system", -- /* To be used ONLY for images which might be legacy split-usr */ -- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), - STRV_IFNOTNULL(generator_late)); - break; - -@@ -659,14 +652,11 @@ int lookup_paths_init( - persistent_config, - USER_CONFIG_UNIT_DIR, - "/etc/systemd/user", -+ "/nix/var/nix/profiles/default/lib/systemd/user", - runtime_config, - "/run/systemd/user", - STRV_IFNOTNULL(generator), -- "/usr/local/share/systemd/user", -- "/usr/share/systemd/user", -- "/usr/local/lib/systemd/user", - USER_DATA_UNIT_DIR, -- "/usr/lib/systemd/user", - STRV_IFNOTNULL(generator_late)); - break; - -@@ -825,7 +815,6 @@ char **generator_binary_paths(RuntimeScope scope) { - case RUNTIME_SCOPE_SYSTEM: - add = strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", -- "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_DIR); - break; - -@@ -833,7 +822,6 @@ char **generator_binary_paths(RuntimeScope scope) { - case RUNTIME_SCOPE_USER: - add = strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", -- "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_DIR); - break; - -@@ -872,14 +860,12 @@ char **env_generator_binary_paths(RuntimeScope runtime_scope) { - case RUNTIME_SCOPE_SYSTEM: - add = strv_new("/run/systemd/system-environment-generators", - "/etc/systemd/system-environment-generators", -- "/usr/local/lib/systemd/system-environment-generators", - SYSTEM_ENV_GENERATOR_DIR); - break; - - case RUNTIME_SCOPE_USER: - add = strv_new("/run/systemd/user-environment-generators", - "/etc/systemd/user-environment-generators", -- "/usr/local/lib/systemd/user-environment-generators", - USER_ENV_GENERATOR_DIR); - break; - diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index f3b85b0190..8ae544b495 100644 +index f3b85b0190..f7aa5fca50 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -43,10 +43,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} @@ -105,11 +24,11 @@ index f3b85b0190..8ae544b495 100644 systemduserconfdir=${systemd_user_conf_dir} -systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system -+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} ++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemd_system_unit_dir} systemdsystemunitpath=${systemd_system_unit_path} -systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} ++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemd_user_unit_dir} systemduserunitpath=${systemd_user_unit_path} systemd_system_generator_dir=${prefix}/lib/systemd/system-generators @@ -126,3 +45,85 @@ index f3b85b0190..8ae544b495 100644 systemdusergeneratorpath=${systemd_user_generator_path} systemd_sleep_dir=${prefix}/lib/systemd/system-sleep +diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c +index a3b09208cb..91a085c6bc 100644 +--- a/src/libsystemd/sd-path/path-lookup.c ++++ b/src/libsystemd/sd-path/path-lookup.c +@@ -69,11 +69,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) { + } + + static const char* const user_data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_DIR, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + +@@ -481,16 +477,13 @@ int lookup_paths_init( + persistent_config, + SYSTEM_CONFIG_UNIT_DIR, + "/etc/systemd/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + ASSERT_PTR(persistent_attached), + ASSERT_PTR(runtime_config), + "/run/systemd/system", + ASSERT_PTR(runtime_attached), + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_DIR, +- "/usr/lib/systemd/system", +- /* To be used ONLY for images which might be legacy split-usr */ +- FLAGS_SET(flags, LOOKUP_PATHS_SPLIT_USR) ? "/lib/systemd/system" : STRV_IGNORE, + STRV_IFNOTNULL(generator_late)); + break; + +@@ -508,13 +501,10 @@ int lookup_paths_init( + add = strv_new(persistent_config, + USER_CONFIG_UNIT_DIR, + "/etc/systemd/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + ASSERT_PTR(runtime_config), + "/run/systemd/user", +- "/usr/local/share/systemd/user", +- "/usr/share/systemd/user", +- "/usr/local/lib/systemd/user", +- USER_DATA_UNIT_DIR, +- "/usr/lib/systemd/user"); ++ USER_DATA_UNIT_DIR); + break; + + case RUNTIME_SCOPE_USER: +@@ -653,7 +643,6 @@ void lookup_paths_log(LookupPaths *lp) { + static const char* const system_generator_paths[] = { + "/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_DIR, + NULL, + }; +@@ -661,7 +650,6 @@ static const char* const system_generator_paths[] = { + static const char* const user_generator_paths[] = { + "/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_DIR, + NULL, + }; +@@ -669,7 +657,6 @@ static const char* const user_generator_paths[] = { + static const char* const system_env_generator_paths[] = { + "/run/systemd/system-environment-generators", + "/etc/systemd/system-environment-generators", +- "/usr/local/lib/systemd/system-environment-generators", + SYSTEM_ENV_GENERATOR_DIR, + NULL, + }; +@@ -677,7 +664,6 @@ static const char* const system_env_generator_paths[] = { + static const char* const user_env_generator_paths[] = { + "/run/systemd/user-environment-generators", + "/etc/systemd/user-environment-generators", +- "/usr/local/lib/systemd/user-environment-generators", + USER_ENV_GENERATOR_DIR, + NULL, + }; diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch index 5c1684281b25..c23b7315cde9 100644 --- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 04103e0fe9..e26c6c5cfd 100644 +index f21a4f7ceb..4c24ce5c98 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1611,7 +1611,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch index c60c5a4cbf9b..44bd2263ddf0 100644 --- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 82d08803fa..8e40b77eba 100644 +index ba50b59f92..9827487453 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -1116,6 +1116,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -1115,6 +1115,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index 82d08803fa..8e40b77eba 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -1178,6 +1181,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -1177,6 +1180,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,7 +35,7 @@ index 82d08803fa..8e40b77eba 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index c0d104578d..51a714ee23 100644 +index 062744519d..95bde4b1c3 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -226,6 +226,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er @@ -69,10 +69,10 @@ index c0d104578d..51a714ee23 100644 r = x11_context_verify_and_warn(&in, LOG_ERR, error); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index e3b4367ec0..448aa7e94d 100644 +index c79bb864df..cbd30214b7 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -673,6 +673,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -676,6 +676,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index e3b4367ec0..448aa7e94d 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -750,6 +754,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -754,6 +758,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index e3b4367ec0..448aa7e94d 100644 if (lrtc == c->local_rtc && !fix_system) return sd_bus_reply_method_return(m, NULL); -@@ -928,6 +935,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -948,6 +955,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index b73489f56b29..119dd75bc2c3 100644 --- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index b94f37c31c..48f5a2526b 100644 +index 29afb08ebc..398ff340cd 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1412,7 +1412,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1418,7 +1418,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index b94f37c31c..48f5a2526b 100644 if (!f) return -errno; -@@ -1453,7 +1453,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1459,7 +1459,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { assert(ret); @@ -56,7 +56,7 @@ index b94f37c31c..48f5a2526b 100644 if (!f) return -errno; -@@ -1565,7 +1565,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1570,7 +1570,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index b94f37c31c..48f5a2526b 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1617,7 +1617,7 @@ int get_timezone(char **ret) { +@@ -1622,7 +1622,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* Return EINVAL if not a symlink */ @@ -75,10 +75,10 @@ index b94f37c31c..48f5a2526b 100644 return -EINVAL; if (!timezone_is_valid(e, LOG_DEBUG)) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 6afabef430..c1e3af77e1 100644 +index 9be62b8df3..2044e9f8d0 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -648,7 +648,7 @@ static int process_timezone(int rfd) { +@@ -598,7 +598,7 @@ static int process_timezone(int rfd) { if (isempty(arg_timezone)) return 0; @@ -88,10 +88,10 @@ index 6afabef430..c1e3af77e1 100644 r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false); if (r < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 756ce11b1f..436804b3bd 100644 +index 2b735e4df4..7a21f34edd 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1862,8 +1862,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1851,8 +1851,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -103,7 +103,7 @@ index 756ce11b1f..436804b3bd 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 448aa7e94d..2161e09579 100644 +index cbd30214b7..b9b2f533a4 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -280,7 +280,7 @@ static int context_read_data(Context *c) { diff --git a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch index fe0dca1863dd..c670f076c34a 100644 --- a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 32354027f1..1d231f1afc 100644 +index 36dbeb9daa..265eda2751 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -297,7 +297,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -301,7 +301,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch index d7a11e3996cb..bf9f028d6300 100644 --- a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch @@ -12,7 +12,7 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/constants.h b/src/basic/constants.h -index e70817c51f..859e673a67 100644 +index 5aaf8f535c..934175fb51 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h @@ -62,13 +62,15 @@ diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 24c74216b729..20b4641ac000 100644 --- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 67f44e16e9..dda6614561 100644 +index e26a8579c5..af814cd551 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -358,6 +358,7 @@ static void notify_supervisor(void) { diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 733e042ec0dd..13578115a014 100644 --- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index c96207428d..1e95eec7f1 100644 +index 181bb4ccef..2b1410d8a1 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -217,6 +217,7 @@ static int execute( +@@ -218,6 +218,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index b546c7eeb62e..9e29c34efcd7 100644 --- a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index fcb3aa9399..b9e69cbf91 100644 +index dff5a3a549..01344e5cf6 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -17,10 +17,10 @@ diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index e17d281a6101..14ff6ca57d46 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index e26c6c5cfd..6cc1642684 100644 +index 4c24ce5c98..3c944559fc 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4035,9 +4035,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -4135,9 +4135,17 @@ static int build_generator_environment(Manager *m, char ***ret) { * adjust generated units to that. Let's pass down some bits of information that are easy for us to * determine (but a bit harder for generator scripts to determine), as environment variables. */ diff --git a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch index 0fd274d7a5b7..fbaaed99cb61 100644 --- a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch +++ b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch @@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191 1 file changed, 8 deletions(-) diff --git a/src/core/taint.c b/src/core/taint.c -index 969b37f209..de64e8f1f9 100644 +index b7a1c647a2..c04864c478 100644 --- a/src/core/taint.c +++ b/src/core/taint.c -@@ -41,14 +41,6 @@ char* taint_string(void) { +@@ -41,14 +41,6 @@ char** taint_strv(void) { _cleanup_free_ char *bin = NULL, *usr_sbin = NULL, *var_run = NULL; diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch index 57ca20fdcbf7..41e836ca04eb 100644 --- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch +++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch @@ -27,10 +27,10 @@ filename_is_valid with path_is_valid. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c -index 10a78adfaf..6493d5d270 100644 +index 36a0f906da..e0f42abca2 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c -@@ -670,7 +670,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { +@@ -721,7 +721,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { fn = strjoina("libtss2-tcti-", driver, ".so.0"); /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ @@ -38,4 +38,4 @@ index 10a78adfaf..6493d5d270 100644 + if (!path_is_valid(fn)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); - context->tcti_dl = dlopen(fn, RTLD_NOW); + context->tcti_dl = dlopen(fn, RTLD_NOW|RTLD_NODELETE); diff --git a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch index cc7106f9bb3d..6c7a1aff4094 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch @@ -30,10 +30,10 @@ are written into `$XDG_CONFIG_HOME/systemd/user`. 1 file changed, 3 insertions(+) diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c -index 15398f8364..8d440cee59 100644 +index c42a31153d..154dbf0402 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c -@@ -322,6 +322,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { +@@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { sd_bus *bus; int r; @@ -41,5 +41,5 @@ index 15398f8364..8d440cee59 100644 + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead."); + if (!on_tty() && !arg_stdin) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units if not on a tty."); + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units interactively if not on a tty."); diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch index 7d941c33b927..debcaab14e81 100644 --- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch +++ b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch @@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build -index cecdbc3aa7..bd7f8ec580 100644 +index bffda86845..cb5dcec0f9 100644 --- a/meson.build +++ b/meson.build -@@ -2652,7 +2652,6 @@ install_data('LICENSE.GPL2', +@@ -2781,7 +2781,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) diff --git a/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch b/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch new file mode 100644 index 000000000000..b4b9d9ee3e3d --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch @@ -0,0 +1,125 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jared Baur +Date: Sun, 17 Nov 2024 12:46:36 -0800 +Subject: [PATCH] Revert "bootctl: update/list/remove all instances of + systemd-boot in /EFI/BOOT" + +This reverts commit 929f41c6528fb630753d4e2f588a8eb6c2f6a609. +--- + src/bootctl/bootctl-install.c | 52 ++++------------------------------- + src/bootctl/bootctl-status.c | 8 ++++-- + 2 files changed, 12 insertions(+), 48 deletions(-) + +diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c +index 7ad264d882..298e749ed6 100644 +--- a/src/bootctl/bootctl-install.c ++++ b/src/bootctl/bootctl-install.c +@@ -323,46 +323,6 @@ static int create_subdirs(const char *root, const char * const *subdirs) { + return 0; + } + +-static int update_efi_boot_binaries(const char *esp_path, const char *source_path) { +- _cleanup_closedir_ DIR *d = NULL; +- _cleanup_free_ char *p = NULL; +- int r, ret = 0; +- +- r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d); +- if (r == -ENOENT) +- return 0; +- if (r < 0) +- return log_error_errno(r, "Failed to open directory \"%s/EFI/BOOT\": %m", esp_path); +- +- FOREACH_DIRENT(de, d, break) { +- _cleanup_close_ int fd = -EBADF; +- _cleanup_free_ char *v = NULL; +- +- if (!endswith_no_case(de->d_name, ".efi")) +- continue; +- +- fd = openat(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC); +- if (fd < 0) +- return log_error_errno(errno, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name); +- +- r = get_file_version(fd, &v); +- if (r == -ESRCH) +- continue; /* No version information */ +- if (r < 0) +- return r; +- if (startswith(v, "systemd-boot ")) { +- _cleanup_free_ char *dest_path = NULL; +- +- dest_path = path_join(p, de->d_name); +- if (!dest_path) +- return log_oom(); +- +- RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false)); +- } +- } +- +- return ret; +-} + + static int copy_one_file(const char *esp_path, const char *name, bool force) { + char *root = IN_SET(arg_install_source, ARG_INSTALL_SOURCE_AUTO, ARG_INSTALL_SOURCE_IMAGE) ? arg_root : NULL; +@@ -416,12 +376,9 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) { + if (r < 0) + return log_error_errno(r, "Failed to resolve path %s under directory %s: %m", v, esp_path); + +- RET_GATHER(ret, copy_file_with_version_check(source_path, default_dest_path, force)); +- +- /* If we were installed under any other name in /EFI/BOOT, make sure we update those binaries +- * as well. */ +- if (!force) +- RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path)); ++ r = copy_file_with_version_check(source_path, default_dest_path, force); ++ if (r < 0 && ret == 0) ++ ret = r; + } + + return ret; +@@ -1102,6 +1059,9 @@ static int remove_boot_efi(const char *esp_path) { + if (!endswith_no_case(de->d_name, ".efi")) + continue; + ++ if (!startswith_no_case(de->d_name, "boot")) ++ continue; ++ + fd = openat(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC); + if (fd < 0) + return log_error_errno(errno, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name); +diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c +index 6bcb348935..fe753510ce 100644 +--- a/src/bootctl/bootctl-status.c ++++ b/src/bootctl/bootctl-status.c +@@ -187,6 +187,7 @@ static int status_variables(void) { + static int enumerate_binaries( + const char *esp_path, + const char *path, ++ const char *prefix, + char **previous, + bool *is_first) { + +@@ -212,6 +213,9 @@ static int enumerate_binaries( + if (!endswith_no_case(de->d_name, ".efi")) + continue; + ++ if (prefix && !startswith_no_case(de->d_name, prefix)) ++ continue; ++ + filename = path_join(p, de->d_name); + if (!filename) + return log_oom(); +@@ -268,11 +272,11 @@ static int status_binaries(const char *esp_path, sd_id128_t partition) { + printf(" (/dev/disk/by-partuuid/" SD_ID128_UUID_FORMAT_STR ")", SD_ID128_FORMAT_VAL(partition)); + printf("\n"); + +- r = enumerate_binaries(esp_path, "EFI/systemd", &last, &is_first); ++ r = enumerate_binaries(esp_path, "EFI/systemd", NULL, &last, &is_first); + if (r < 0) + goto fail; + +- k = enumerate_binaries(esp_path, "EFI/BOOT", &last, &is_first); ++ k = enumerate_binaries(esp_path, "EFI/BOOT", "boot", &last, &is_first); + if (k < 0) { + r = k; + goto fail; diff --git a/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch similarity index 87% rename from pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch rename to pkgs/os-specific/linux/systemd/0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch index eb06459a560d..a1b1575a51d2 100644 --- a/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch +++ b/pkgs/os-specific/linux/systemd/0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch @@ -13,10 +13,10 @@ directly. 1 file changed, 11 insertions(+) diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c -index 5c308a04bc..81aa3d3334 100644 +index d002501d29..9b835dc031 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c -@@ -21,6 +21,11 @@ +@@ -23,6 +23,11 @@ #include "timesyncd-conf.h" #include "timesyncd-manager.h" #include "user-util.h" @@ -26,9 +26,9 @@ index 5c308a04bc..81aa3d3334 100644 +extern void __nss_disable_nscd(void (*)(size_t, struct traced_file *)); +static void register_traced_file(size_t dbidx, struct traced_file *finfo) {} - static int advance_tstamp(int fd, const struct stat *st) { - assert_se(fd >= 0); -@@ -198,6 +203,12 @@ static int run(int argc, char *argv[]) { + static int advance_tstamp(int fd, usec_t epoch) { + assert(fd >= 0); +@@ -201,6 +206,12 @@ static int run(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to parse fallback server strings: %m"); diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 184616844021..59ecbb865ef9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,77 +1,76 @@ -# NOTE: Make sure to (re-)format this file on changes with `nixpkgs-fmt`! - -{ stdenv -, lib -, nixosTests -, pkgsCross -, testers -, fetchFromGitHub -, fetchzip -, fetchpatch2 -, buildPackages -, makeBinaryWrapper -, ninja -, meson -, m4 -, pkg-config -, coreutils -, gperf -, getent -, glibcLocales -, autoPatchelfHook +{ + stdenv, + lib, + nixosTests, + pkgsCross, + testers, + fetchFromGitHub, + fetchzip, + buildPackages, + makeBinaryWrapper, + ninja, + meson, + m4, + pkg-config, + coreutils, + gperf, + getent, + glibcLocales, + autoPatchelfHook, # glib is only used during tests (test-bus-gvariant, test-bus-marshal) -, glib -, gettext -, python3Packages + glib, + gettext, + python3Packages, # Mandatory dependencies -, libcap -, util-linux -, kbd -, kmod -, libxcrypt + libcap, + util-linux, + kbd, + kmod, + libxcrypt, # Optional dependencies -, pam -, cryptsetup -, audit -, acl -, lz4 -, libgcrypt -, libgpg-error -, libidn2 -, curl -, gnutar -, gnupg -, zlib -, xz -, zstd -, tpm2-tss -, libuuid -, libapparmor -, intltool -, bzip2 -, pcre2 -, elfutils -, linuxHeaders ? stdenv.cc.libc.linuxHeaders -, gnutls -, iptables -, withSelinux ? false -, libselinux -, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp -, libseccomp -, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools -, kexec-tools -, bashInteractive -, bash -, libmicrohttpd -, libfido2 -, p11-kit -, libpwquality -, qrencode -, libarchive -, llvmPackages + pam, + cryptsetup, + audit, + acl, + lz4, + openssl, + libgcrypt, + libgpg-error, + libidn2, + curl, + gnutar, + gnupg, + zlib, + xz, + zstd, + tpm2-tss, + libuuid, + libapparmor, + intltool, + bzip2, + pcre2, + elfutils, + linuxHeaders ? stdenv.cc.libc.linuxHeaders, + gnutls, + iptables, + withSelinux ? false, + libselinux, + withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, + libseccomp, + withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools, + kexec-tools, + bashInteractive, + bash, + libmicrohttpd, + libfido2, + p11-kit, + libpwquality, + qrencode, + libarchive, + llvmPackages, # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to # be available during build time. @@ -84,38 +83,41 @@ # `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to # us. Working around this is important, because systemd is in the dependency # closure of GHC via emscripten and jdk. -, bpftools -, libbpf + bpftools, + libbpf, # Needed to produce a ukify that works for cross compiling UKIs. -, targetPackages + targetPackages, -, withAcl ? true -, withAnalyze ? true -, withApparmor ? true -, withAudit ? true + withAcl ? true, + withAnalyze ? true, + withApparmor ? true, + withAudit ? true, # compiles systemd-boot, assumes EFI is available. -, withBootloader ? withEfi + withBootloader ? + withEfi && !stdenv.hostPlatform.isMusl # "Unknown 64-bit data model" - && !stdenv.hostPlatform.isRiscV32 + && !stdenv.hostPlatform.isRiscV32, # adds bzip2, lz4, xz and zstd -, withCompression ? true -, withCoredump ? true -, withCryptsetup ? true -, withRepart ? true -, withDocumentation ? true -, withEfi ? stdenv.hostPlatform.isEfi -, withFido2 ? true + withCompression ? true, + withCoredump ? true, + withCryptsetup ? true, + withRepart ? true, + withDocumentation ? true, + withEfi ? stdenv.hostPlatform.isEfi, + withFido2 ? true, # conflicts with the NixOS /etc management -, withFirstboot ? false -, withHomed ? !stdenv.hostPlatform.isMusl -, withHostnamed ? true -, withHwdb ? true -, withImportd ? !stdenv.hostPlatform.isMusl -, withIptables ? true -, withKmod ? true -, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" + withFirstboot ? false, + withGcrypt ? true, + withHomed ? !stdenv.hostPlatform.isMusl, + withHostnamed ? true, + withHwdb ? true, + withImportd ? !stdenv.hostPlatform.isMusl, + withIptables ? true, + withKmod ? true, + withLibBPF ? + lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" # assumes hard floats && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 @@ -127,72 +129,77 @@ # buildPackages.targetPackages.llvmPackages is the same as llvmPackages, # but we do it this way to avoid taking llvmPackages as an input, and # risking making it too easy to ignore the above comment about llvmPackages. - && lib.meta.availableOn stdenv.hostPlatform buildPackages.targetPackages.llvmPackages.compiler-rt -, withLibidn2 ? true -, withLocaled ? true -, withLogind ? true -, withMachined ? true -, withNetworkd ? true -, withNss ? !stdenv.hostPlatform.isMusl -, withOomd ? true -, withPam ? true -, withPasswordQuality ? true -, withPCRE2 ? true -, withPolkit ? true -, withPortabled ? !stdenv.hostPlatform.isMusl -, withQrencode ? true -, withRemote ? !stdenv.hostPlatform.isMusl -, withResolved ? true -, withShellCompletions ? true -, withSysusers ? true -, withSysupdate ? true -, withTimedated ? true -, withTimesyncd ? true -, withTpm2Tss ? true + && lib.meta.availableOn stdenv.hostPlatform buildPackages.targetPackages.llvmPackages.compiler-rt, + withLibidn2 ? true, + withLocaled ? true, + withLogind ? true, + withMachined ? true, + withNetworkd ? true, + withNss ? !stdenv.hostPlatform.isMusl, + withOomd ? true, + withOpenSSL ? true, + withPam ? true, + withPasswordQuality ? true, + withPCRE2 ? true, + withPolkit ? true, + withPortabled ? !stdenv.hostPlatform.isMusl, + withQrencode ? true, + withRemote ? !stdenv.hostPlatform.isMusl, + withResolved ? true, + withShellCompletions ? true, + withSysusers ? true, + withSysupdate ? true, + withTimedated ? true, + withTimesyncd ? true, + withTpm2Tss ? true, # adds python to closure which is too much by default -, withUkify ? false -, withUserDb ? true -, withUtmp ? !stdenv.hostPlatform.isMusl -, withVmspawn ? true + withUkify ? false, + withUserDb ? true, + withUtmp ? !stdenv.hostPlatform.isMusl, + withVmspawn ? true, # kernel-install shouldn't usually be used on NixOS, but can be useful, e.g. for # building disk images for non-NixOS systems. To save users from trying to use it # on their live NixOS system, we disable it by default. -, withKernelInstall ? false -, withLibarchive ? true + withKernelInstall ? false, + withLibarchive ? true, # tests assume too much system access for them to be feasible for us right now -, withTests ? false + withTests ? false, # build only libudev and libsystemd -, buildLibsOnly ? false + buildLibsOnly ? false, # yes, pname is an argument here -, pname ? "systemd" + pname ? "systemd", -, libxslt -, docbook_xsl -, docbook_xml_dtd_42 -, docbook_xml_dtd_45 -, withLogTrace ? false + libxslt, + docbook_xsl, + docbook_xml_dtd_42, + docbook_xml_dtd_45, + withLogTrace ? false, }: assert withImportd -> withCompression; assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; assert withHomed -> withPam; +assert withHomed -> withOpenSSL; +assert withFido2 -> withOpenSSL; +assert withSysupdate -> withOpenSSL; +assert withImportd -> (withGcrypt || withOpenSSL); assert withUkify -> (withEfi && withBootloader); assert withRepart -> withCryptsetup; assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; - wantGcrypt = withResolved || withImportd; - version = "256.8"; + + version = "257.2"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. # command: # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' - releaseTimestamp = "1720202583"; + releaseTimestamp = "1734643670"; in stdenv.mkDerivation (finalAttrs: { inherit pname version; @@ -203,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-L/MCsCCMVvK7LgxlaLFpnmsJuTu33cPaiMxIpHU7Tzg="; + hash = "sha256-A64RK+EIea98dpq8qzXld4kbDGvYsKf/vDnNtMmwSBM="; }; # On major changes, or when otherwise required, you *must* : @@ -214,100 +221,109 @@ stdenv.mkDerivation (finalAttrs: { # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all # patches - patches = [ - ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch - ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch - ./0003-Fix-NixOS-containers.patch - ./0004-Add-some-NixOS-specific-unit-directories.patch - ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch - ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch - ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch - ./0008-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0009-add-rootprefix-to-lookup-dir-paths.patch - ./0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch - ./0013-inherit-systemd-environment-when-calling-generators.patch - ./0014-core-don-t-taint-on-unmerged-usr.patch - ./0015-tpm2_context_init-fix-driver-name-checking.patch - ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch - ./0017-meson.build-do-not-create-systemdstatedir.patch - - # https://github.com/systemd/systemd/issues/33392 - (fetchpatch2 { - url = "https://github.com/systemd/systemd/commit/f8b02a56febf14adf2474875a1b6625f1f346a6f.patch?full_index=1"; - hash = "sha256-qRW92gPtACjk+ifptkw5mujhHlkCF56M3azGIjLiMKE="; - revert = true; - }) - ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ - ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch - ] ++ lib.optional stdenv.hostPlatform.isMusl ( - let - oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-89b75b46371d5e9172cb496b461824d8551a2af5.tar.gz"; - hash = "sha256-etdIIdo3FezVafEYP5uAS9pO36Rdea2A+Da1P44cPXg="; - }; - musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; - in + patches = [ - (musl-patches + "/0004-missing_type.h-add-comparison_fn_t.patch") - (musl-patches + "/0005-add-fallback-parse_printf_format-implementation.patch") - (musl-patches + "/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") - (musl-patches + "/0007-add-missing-FTW_-macros-for-musl.patch") - (musl-patches + "/0008-Use-uintmax_t-for-handling-rlim_t.patch") - (musl-patches + "/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch") - (musl-patches + "/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch") - (musl-patches + "/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch") - (musl-patches + "/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch") - (musl-patches + "/0013-avoid-redefinition-of-prctl_mm_map-structure.patch") - (musl-patches + "/0014-do-not-disable-buffer-in-writing-files.patch") - (musl-patches + "/0015-Handle-__cpu_mask-usage.patch") - (musl-patches + "/0016-Handle-missing-gshadow.patch") - (musl-patches + "/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - (musl-patches + "/0018-pass-correct-parameters-to-getdents64.patch") - (musl-patches + "/0019-Adjust-for-musl-headers.patch") - (musl-patches + "/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") - (musl-patches + "/0021-errno-util-Make-STRERROR-portable-for-musl.patch") - (musl-patches + "/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch") - (musl-patches + "/0023-shared-Do-not-use-malloc_info-on-musl.patch") - (musl-patches + "/0024-avoid-missing-LOCK_EX-declaration.patch") - (musl-patches + "/0025-include-signal.h-to-avoid-the-undeclared-error.patch") - (musl-patches + "/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch") - (musl-patches + "/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch") - (musl-patches + "/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch") + ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch + ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0003-Fix-NixOS-containers.patch + ./0004-Add-some-NixOS-specific-unit-directories.patch + ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0008-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0009-add-rootprefix-to-lookup-dir-paths.patch + ./0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0013-inherit-systemd-environment-when-calling-generators.patch + ./0014-core-don-t-taint-on-unmerged-usr.patch + ./0015-tpm2_context_init-fix-driver-name-checking.patch + ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch + ./0017-meson.build-do-not-create-systemdstatedir.patch + ./0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch # https://github.com/systemd/systemd/issues/33392 ] - ); + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ + ./0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch + ] + ++ lib.optionals stdenv.hostPlatform.isMusl ( + let + # NOTE: the master-next branch does not have stable URLs. + # If we need patches that aren't in master yet, they'll have to be + # vendored. + oe-core = fetchzip { + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-4891f47cdaf919033bf1c02cc12e4805e5db99a0.tar.gz"; + hash = "sha256-YKL/oC+rPZ2EEVNidEV+pJihZgUv7vLb0OASplgktn4="; + }; + in + map (patch: "${oe-core}/meta/recipes-core/systemd/systemd/${patch}") [ + "0003-missing_type.h-add-comparison_fn_t.patch" + "0004-add-fallback-parse_printf_format-implementation.patch" + "0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch" + "0006-add-missing-FTW_-macros-for-musl.patch" + "0007-Use-uintmax_t-for-handling-rlim_t.patch" + "0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch" + "0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch" + "0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch" + "0011-avoid-redefinition-of-prctl_mm_map-structure.patch" + "0012-do-not-disable-buffer-in-writing-files.patch" + "0013-Handle-__cpu_mask-usage.patch" + "0014-Handle-missing-gshadow.patch" + "0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch" + "0016-pass-correct-parameters-to-getdents64.patch" + "0017-Adjust-for-musl-headers.patch" + "0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch" + "0019-errno-util-Make-STRERROR-portable-for-musl.patch" + "0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch" + "0021-shared-Do-not-use-malloc_info-on-musl.patch" + "0022-avoid-missing-LOCK_EX-declaration.patch" + "0023-include-signal.h-to-avoid-the-undeclared-error.patch" + "0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch" + "0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch" + "0026-build-path.c-avoid-boot-time-segfault-for-musl.patch" + ] + ); - postPatch = '' - substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" - '' + lib.optionalString withLibBPF '' - substituteInPlace meson.build \ - --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'" - '' + lib.optionalString withUkify '' - substituteInPlace src/ukify/ukify.py \ - --replace \ - "'readelf'" \ - "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \ - --replace \ - "/usr/lib/systemd/boot/efi" \ - "$out/lib/systemd/boot/efi" - '' - # Finally, patch shebangs in scripts used at build time. This must not patch - # scripts that will end up in the output, to avoid build platform references - # when cross-compiling. - + '' - shopt -s extglob - patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh - ''; + postPatch = + '' + substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + '' + + lib.optionalString withLibBPF '' + substituteInPlace meson.build \ + --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'" + '' + + lib.optionalString withUkify '' + substituteInPlace src/ukify/ukify.py \ + --replace \ + "'readelf'" \ + "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \ + --replace \ + "/usr/lib/systemd/boot/efi" \ + "$out/lib/systemd/boot/efi" + '' + # Finally, patch shebangs in scripts used at build time. This must not patch + # scripts that will end up in the output, to avoid build platform references + # when cross-compiling. + + '' + shopt -s extglob + patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh + ''; - outputs = [ "out" "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); + outputs = [ + "out" + "dev" + ] ++ (lib.optional (!buildLibsOnly) "man"); separateDebugInfo = true; - hardeningDisable = [ - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523 - "trivialautovarinit" - # breaks clang -target bpf; should be fixed to filter target? - ] ++ (lib.optionals withLibBPF ["zerocallusedregs" "shadowstack"]); + hardeningDisable = + [ + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523 + "trivialautovarinit" + # breaks clang -target bpf; should be fixed to filter target? + ] + ++ (lib.optionals withLibBPF [ + "zerocallusedregs" + "shadowstack" + ]); nativeBuildInputs = [ @@ -329,14 +345,21 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_42 docbook_xml_dtd_45 bash - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ] ++ lib.optional withEfi ps.pyelftools)) + (buildPackages.python3Packages.python.withPackages ( + ps: + with ps; + [ + lxml + jinja2 + ] + ++ lib.optional withEfi ps.pyelftools + )) ] ++ lib.optionals withLibBPF [ bpftools buildPackages.llvmPackages.clang buildPackages.llvmPackages.libllvm - ] - ; + ]; autoPatchelfFlags = [ "--keep-libc" ]; @@ -349,13 +372,23 @@ stdenv.mkDerivation (finalAttrs: { bashInteractive # for patch shebangs ] - ++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ] + ++ lib.optionals withGcrypt [ + libgcrypt + libgpg-error + ] + ++ lib.optionals withOpenSSL [ openssl ] ++ lib.optional withTests glib ++ lib.optional withAcl acl ++ lib.optional withApparmor libapparmor ++ lib.optional withAudit audit ++ lib.optional wantCurl (lib.getDev curl) - ++ lib.optionals withCompression [ zlib bzip2 lz4 xz zstd ] + ++ lib.optionals withCompression [ + zlib + bzip2 + lz4 + xz + zstd + ] ++ lib.optional withCoredump elfutils ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withKexectools kexec-tools @@ -366,7 +399,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withPam pam ++ lib.optional withPCRE2 pcre2 ++ lib.optional withSelinux libselinux - ++ lib.optionals withRemote [ libmicrohttpd gnutls ] + ++ lib.optionals withRemote [ + libmicrohttpd + gnutls + ] ++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ] ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] ++ lib.optionals withLibBPF [ libbpf ] @@ -375,182 +411,186 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withPasswordQuality [ libpwquality ] ++ lib.optionals withQrencode [ qrencode ] ++ lib.optionals withLibarchive [ libarchive ] - ++ lib.optional (withBootloader && stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override { - doFakeLibgcc = true; - }) - ; + ++ lib.optional (withBootloader && stdenv.targetPlatform.useLLVM or false) ( + llvmPackages.compiler-rt.override { + doFakeLibgcc = true; + } + ); mesonBuildType = "release"; - mesonFlags = [ - # Options + mesonFlags = + [ + # Options - # We bump this attribute on every (major) version change to ensure that we - # have known-good value for a timestamp that is in the (not so distant) - # past. This serves as a lower bound for valid system timestamps during - # startup. Systemd will reset the system timestamp if this date is +- 15 - # years from the system time. - # See the systemd v250 release notes for further details: - # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 - (lib.mesonOption "time-epoch" releaseTimestamp) + # We bump this attribute on every (major) version change to ensure that we + # have known-good value for a timestamp that is in the (not so distant) + # past. This serves as a lower bound for valid system timestamps during + # startup. Systemd will reset the system timestamp if this date is +- 15 + # years from the system time. + # See the systemd v250 release notes for further details: + # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 + (lib.mesonOption "time-epoch" releaseTimestamp) - (lib.mesonOption "version-tag" version) - (lib.mesonOption "mode" "release") - (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 - (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash") - (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d") - (lib.mesonOption "kmod-path" "${kmod}/bin/kmod") + (lib.mesonOption "version-tag" version) + (lib.mesonOption "mode" "release") + (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 + (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash") + (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d") + (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d") + (lib.mesonOption "kmod-path" "${kmod}/bin/kmod") - # Attempts to check /usr/sbin and that fails in macOS sandbox because - # permission is denied. If /usr/sbin is not a symlink, it defaults to true. - # We set it to false since stdenv moves sbin/* to bin and creates a symlink, - # that is, we do not have split bin. - (lib.mesonOption "split-bin" "false") + # Attempts to check /usr/sbin and that fails in macOS sandbox because + # permission is denied. If /usr/sbin is not a symlink, it defaults to true. + # We set it to false since stdenv moves sbin/* to bin and creates a symlink, + # that is, we do not have split bin. + (lib.mesonOption "split-bin" "false") - # D-Bus - (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") - (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services") - (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") + # D-Bus + (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services") + (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") - # pkgconfig - (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig") - (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig") + # pkgconfig + (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig") + (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig") - # Keyboard - (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") - (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") + # Keyboard + (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") + (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") - # SBAT - (lib.mesonOption "sbat-distro" "nixos") - (lib.mesonOption "sbat-distro-summary" "NixOS") - (lib.mesonOption "sbat-distro-url" "https://nixos.org/") - (lib.mesonOption "sbat-distro-pkgname" pname) - (lib.mesonOption "sbat-distro-version" version) + # SBAT + (lib.mesonOption "sbat-distro" "nixos") + (lib.mesonOption "sbat-distro-summary" "NixOS") + (lib.mesonOption "sbat-distro-url" "https://nixos.org/") + (lib.mesonOption "sbat-distro-pkgname" pname) + (lib.mesonOption "sbat-distro-version" version) - # Users - (lib.mesonOption "system-uid-max" "999") - (lib.mesonOption "system-gid-max" "999") + # Users + (lib.mesonOption "system-uid-max" "999") + (lib.mesonOption "system-gid-max" "999") - # SysVinit - (lib.mesonOption "sysvinit-path" "") - (lib.mesonOption "sysvrcnd-path" "") + # SysVinit + (lib.mesonOption "sysvinit-path" "") + (lib.mesonOption "sysvrcnd-path" "") - # Login - (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin") - (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin") + # Login + (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin") + (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin") - # Mount - (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount") - (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount") + # Mount + (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount") + (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount") - # SSH - # Disabled for now until someone makes this work. - (lib.mesonOption "sshconfdir" "no") - (lib.mesonOption "sshdconfdir" "no") + # SSH + # Disabled for now until someone makes this work. + (lib.mesonOption "sshconfdir" "no") + (lib.mesonOption "sshdconfdir" "no") + # Features - # Features + # Tests + (lib.mesonBool "tests" withTests) + (lib.mesonEnable "glib" withTests) + (lib.mesonEnable "dbus" withTests) - # Tests - (lib.mesonBool "tests" withTests) - (lib.mesonEnable "glib" withTests) - (lib.mesonEnable "dbus" withTests) + # Compression + (lib.mesonEnable "bzip2" withCompression) + (lib.mesonEnable "lz4" withCompression) + (lib.mesonEnable "xz" withCompression) + (lib.mesonEnable "zstd" withCompression) + (lib.mesonEnable "zlib" withCompression) - # Compression - (lib.mesonEnable "bzip2" withCompression) - (lib.mesonEnable "lz4" withCompression) - (lib.mesonEnable "xz" withCompression) - (lib.mesonEnable "zstd" withCompression) - (lib.mesonEnable "zlib" withCompression) + # NSS + (lib.mesonEnable "nss-mymachines" (withNss && withMachined)) + (lib.mesonEnable "nss-resolve" withNss) + (lib.mesonBool "nss-myhostname" withNss) + (lib.mesonBool "nss-systemd" withNss) - # NSS - (lib.mesonEnable "nss-mymachines" (withNss && withMachined)) - (lib.mesonEnable "nss-resolve" withNss) - (lib.mesonBool "nss-myhostname" withNss) - (lib.mesonBool "nss-systemd" withNss) + # Cryptsetup + (lib.mesonEnable "libcryptsetup" withCryptsetup) + (lib.mesonEnable "libcryptsetup-plugins" withCryptsetup) + (lib.mesonEnable "p11kit" (withHomed || withCryptsetup)) - # Cryptsetup - (lib.mesonEnable "libcryptsetup" withCryptsetup) - (lib.mesonEnable "libcryptsetup-plugins" withCryptsetup) - (lib.mesonEnable "p11kit" (withHomed || withCryptsetup)) + # FIDO2 + (lib.mesonEnable "libfido2" withFido2) + (lib.mesonEnable "openssl" withOpenSSL) - # FIDO2 - (lib.mesonEnable "libfido2" withFido2) - (lib.mesonEnable "openssl" (withHomed || withFido2 || withSysupdate)) + # Password Quality + (lib.mesonEnable "pwquality" withPasswordQuality) + (lib.mesonEnable "passwdqc" false) - # Password Quality - (lib.mesonEnable "pwquality" withPasswordQuality) - (lib.mesonEnable "passwdqc" false) + # Remote + (lib.mesonEnable "remote" withRemote) + (lib.mesonEnable "microhttpd" withRemote) - # Remote - (lib.mesonEnable "remote" withRemote) - (lib.mesonEnable "microhttpd" withRemote) + (lib.mesonEnable "pam" withPam) + (lib.mesonEnable "acl" withAcl) + (lib.mesonEnable "audit" withAudit) + (lib.mesonEnable "apparmor" withApparmor) + (lib.mesonEnable "gcrypt" withGcrypt) + (lib.mesonEnable "importd" withImportd) + (lib.mesonEnable "homed" withHomed) + (lib.mesonEnable "polkit" withPolkit) + (lib.mesonEnable "elfutils" withCoredump) + (lib.mesonEnable "libcurl" wantCurl) + (lib.mesonEnable "libidn" false) + (lib.mesonEnable "libidn2" withLibidn2) + (lib.mesonEnable "libiptc" withIptables) + (lib.mesonEnable "repart" withRepart) + (lib.mesonEnable "sysupdate" withSysupdate) + (lib.mesonEnable "seccomp" withLibseccomp) + (lib.mesonEnable "selinux" withSelinux) + (lib.mesonEnable "tpm2" withTpm2Tss) + (lib.mesonEnable "pcre2" withPCRE2) + (lib.mesonEnable "bpf-framework" withLibBPF) + (lib.mesonEnable "bootloader" withBootloader) + (lib.mesonEnable "ukify" withUkify) + (lib.mesonEnable "kmod" withKmod) + (lib.mesonEnable "qrencode" withQrencode) + (lib.mesonEnable "vmspawn" withVmspawn) + (lib.mesonEnable "libarchive" withLibarchive) + (lib.mesonEnable "xenctrl" false) + (lib.mesonEnable "gnutls" false) + (lib.mesonEnable "xkbcommon" false) + (lib.mesonEnable "man" true) - (lib.mesonEnable "pam" withPam) - (lib.mesonEnable "acl" withAcl) - (lib.mesonEnable "audit" withAudit) - (lib.mesonEnable "apparmor" withApparmor) - (lib.mesonEnable "gcrypt" wantGcrypt) - (lib.mesonEnable "importd" withImportd) - (lib.mesonEnable "homed" withHomed) - (lib.mesonEnable "polkit" withPolkit) - (lib.mesonEnable "elfutils" withCoredump) - (lib.mesonEnable "libcurl" wantCurl) - (lib.mesonEnable "libidn" false) - (lib.mesonEnable "libidn2" withLibidn2) - (lib.mesonEnable "libiptc" withIptables) - (lib.mesonEnable "repart" withRepart) - (lib.mesonEnable "sysupdate" withSysupdate) - (lib.mesonEnable "seccomp" withLibseccomp) - (lib.mesonEnable "selinux" withSelinux) - (lib.mesonEnable "tpm2" withTpm2Tss) - (lib.mesonEnable "pcre2" withPCRE2) - (lib.mesonEnable "bpf-framework" withLibBPF) - (lib.mesonEnable "bootloader" withBootloader) - (lib.mesonEnable "ukify" withUkify) - (lib.mesonEnable "kmod" withKmod) - (lib.mesonEnable "qrencode" withQrencode) - (lib.mesonEnable "vmspawn" withVmspawn) - (lib.mesonEnable "libarchive" withLibarchive) - (lib.mesonEnable "xenctrl" false) - (lib.mesonEnable "gnutls" false) - (lib.mesonEnable "xkbcommon" false) - (lib.mesonEnable "man" true) + (lib.mesonBool "analyze" withAnalyze) + (lib.mesonBool "logind" withLogind) + (lib.mesonBool "localed" withLocaled) + (lib.mesonBool "hostnamed" withHostnamed) + (lib.mesonBool "machined" withMachined) + (lib.mesonBool "networkd" withNetworkd) + (lib.mesonBool "oomd" withOomd) + (lib.mesonBool "portabled" withPortabled) + (lib.mesonBool "hwdb" withHwdb) + (lib.mesonBool "timedated" withTimedated) + (lib.mesonBool "timesyncd" withTimesyncd) + (lib.mesonBool "userdb" withUserDb) + (lib.mesonBool "coredump" withCoredump) + (lib.mesonBool "firstboot" withFirstboot) + (lib.mesonBool "resolve" withResolved) + (lib.mesonBool "sysusers" withSysusers) + (lib.mesonBool "efi" withEfi) + (lib.mesonBool "utmp" withUtmp) + (lib.mesonBool "log-trace" withLogTrace) + (lib.mesonBool "kernel-install" withKernelInstall) + (lib.mesonBool "quotacheck" false) + (lib.mesonBool "ldconfig" false) + (lib.mesonBool "install-sysconfdir" false) + (lib.mesonBool "create-log-dirs" false) + (lib.mesonBool "smack" true) + (lib.mesonBool "b_pie" true) - (lib.mesonBool "analyze" withAnalyze) - (lib.mesonBool "logind" withLogind) - (lib.mesonBool "localed" withLocaled) - (lib.mesonBool "hostnamed" withHostnamed) - (lib.mesonBool "machined" withMachined) - (lib.mesonBool "networkd" withNetworkd) - (lib.mesonBool "oomd" withOomd) - (lib.mesonBool "portabled" withPortabled) - (lib.mesonBool "hwdb" withHwdb) - (lib.mesonBool "timedated" withTimedated) - (lib.mesonBool "timesyncd" withTimesyncd) - (lib.mesonBool "userdb" withUserDb) - (lib.mesonBool "coredump" withCoredump) - (lib.mesonBool "firstboot" withFirstboot) - (lib.mesonBool "resolve" withResolved) - (lib.mesonBool "sysusers" withSysusers) - (lib.mesonBool "efi" withEfi) - (lib.mesonBool "utmp" withUtmp) - (lib.mesonBool "log-trace" withLogTrace) - (lib.mesonBool "kernel-install" withKernelInstall) - (lib.mesonBool "quotacheck" false) - (lib.mesonBool "ldconfig" false) - (lib.mesonBool "install-sysconfdir" false) - (lib.mesonBool "create-log-dirs" false) - (lib.mesonBool "smack" true) - (lib.mesonBool "b_pie" true) - - ] ++ lib.optionals (withShellCompletions == false) [ - (lib.mesonOption "bashcompletiondir" "no") - (lib.mesonOption "zshcompletiondir" "no") - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (lib.mesonBool "gshadow" false) - (lib.mesonBool "idn" false) - ]; + ] + ++ lib.optionals (withShellCompletions == false) [ + (lib.mesonOption "bashcompletiondir" "no") + (lib.mesonOption "zshcompletiondir" "no") + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + (lib.mesonBool "gshadow" false) + (lib.mesonBool "idn" false) + ]; preConfigure = let # A list of all the runtime binaries referenced by the source code (plus @@ -560,98 +600,121 @@ stdenv.mkDerivation (finalAttrs: { # The `where` attribute for each of the replacement patterns must be # exhaustive. If another (unhandled) case is found in the source code the # build fails with an error message. - binaryReplacements = [ - { - search = "/usr/bin/getent"; - replacement = "${getent}/bin/getent"; - where = [ "src/nspawn/nspawn-setuid.c" ]; - } - { - search = "/sbin/mkswap"; - replacement = "${lib.getBin util-linux}/sbin/mkswap"; - where = [ - "man/systemd-makefs@.service.xml" - ]; - } - { - search = "/sbin/swapon"; - replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; - where = [ - "src/core/swap.c" - "src/basic/unit-def.h" - ]; - } - { - search = "/sbin/swapoff"; - replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; - where = [ "src/core/swap.c" ]; - } - { - search = "/bin/echo"; - replacement = "${coreutils}/bin/echo"; - where = [ - "man/systemd-analyze.xml" - "man/systemd.service.xml" - "man/systemd-run.xml" - "src/analyze/test-verify.c" - "src/test/test-env-file.c" - "src/test/test-fileio.c" - "src/test/test-load-fragment.c" - ]; - } - { - search = "/bin/cat"; - replacement = "${coreutils}/bin/cat"; - where = [ - "test/test-execute/exec-noexecpaths-simple.service" - "src/journal/cat.c" - ]; - } - { - search = "/usr/lib/systemd/systemd-fsck"; - replacement = "$out/lib/systemd/systemd-fsck"; - where = [ "man/systemd-fsck@.service.xml" ]; - } - ] ++ lib.optionals withImportd [ - { - search = "\"gpg\""; - replacement = "\\\"${gnupg}/bin/gpg\\\""; - where = [ "src/import/pull-common.c" ]; - } - { - search = "\"tar\""; - replacement = "\\\"${gnutar}/bin/tar\\\""; - where = [ - "src/import/export-tar.c" - "src/import/import-common.c" - "src/import/import-tar.c" - ]; - ignore = [ - # occurrences here refer to the tar sub command - "src/sysupdate/sysupdate-resource.c" - "src/sysupdate/sysupdate-transfer.c" - "src/import/pull.c" - "src/import/export.c" - "src/import/import.c" - "src/import/importd.c" - # runs `tar` but also also creates a temporary directory with the string - "src/import/pull-tar.c" - ]; - } - ] ++ lib.optionals withKmod [ - { - search = "/sbin/modprobe"; - replacement = "${lib.getBin kmod}/sbin/modprobe"; - where = [ "units/modprobe@.service" ]; - } - ]; + binaryReplacements = + [ + { + search = "/usr/bin/getent"; + replacement = "${getent}/bin/getent"; + where = [ "src/nspawn/nspawn-setuid.c" ]; + } + { + search = "/sbin/mkswap"; + replacement = "${lib.getBin util-linux}/sbin/mkswap"; + where = [ + "man/systemd-makefs@.service.xml" + ]; + } + { + search = "/sbin/swapon"; + replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; + where = [ + "src/core/swap.c" + "src/basic/unit-def.h" + ]; + } + { + search = "/sbin/swapoff"; + replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; + where = [ "src/core/swap.c" ]; + } + { + search = "/bin/echo"; + replacement = "${coreutils}/bin/echo"; + where = [ + "man/systemd-analyze.xml" + "man/systemd.service.xml" + "man/systemd-run.xml" + "src/analyze/test-verify.c" + "src/test/test-env-file.c" + "src/test/test-fileio.c" + "src/test/test-load-fragment.c" + ]; + } + { + search = "/bin/cat"; + replacement = "${coreutils}/bin/cat"; + where = [ + "test/test-execute/exec-noexecpaths-simple.service" + "src/journal/cat.c" + ]; + } + { + search = "/usr/lib/systemd/systemd-fsck"; + replacement = "$out/lib/systemd/systemd-fsck"; + where = [ "man/systemd-fsck@.service.xml" ]; + } + ] + ++ lib.optionals withImportd [ + { + search = "\"gpg\""; + replacement = "\\\"${gnupg}/bin/gpg\\\""; + where = [ "src/import/pull-common.c" ]; + } + { + search = "\"tar\""; + replacement = "\\\"${gnutar}/bin/tar\\\""; + where = [ + "src/import/export-tar.c" + "src/import/import-common.c" + "src/import/import-tar.c" + ]; + ignore = [ + # occurrences here refer to the tar sub command + "src/sysupdate/sysupdate-resource.c" + "src/sysupdate/sysupdate-transfer.c" + "src/import/pull.c" + "src/import/export.c" + "src/import/import.c" + "src/import/importd.c" + # runs `tar` but also also creates a temporary directory with the string + "src/import/pull-tar.c" + # tar referenced as file suffix + "src/shared/import-util.c" + ]; + } + ] + ++ lib.optionals withKmod [ + { + search = "/sbin/modprobe"; + replacement = "${lib.getBin kmod}/sbin/modprobe"; + where = [ "units/modprobe@.service" ]; + } + ]; # { replacement, search, where, ignore } -> List[str] - mkSubstitute = { replacement, search, where, ignore ? [ ] }: + mkSubstitute = + { + replacement, + search, + where, + ignore ? [ ], + }: map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where; - mkEnsureSubstituted = { replacement, search, where, ignore ? [ ] }: + mkEnsureSubstituted = + { + replacement, + search, + where, + ignore ? [ ], + }: let - ignore' = lib.concatStringsSep "|" (ignore ++ [ "^test" "NEWS" ]); + ignore' = lib.concatStringsSep "|" ( + ignore + ++ [ + "^test" + "NEWS" + ] + ); in '' set +e @@ -687,24 +750,27 @@ stdenv.mkDerivation (finalAttrs: { --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - env.NIX_CFLAGS_COMPILE = toString ([ - # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" - "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + env.NIX_CFLAGS_COMPILE = toString ( + [ + # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" + "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENTS_PATH" - "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENTS_PATH" + "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - "-USYSTEMD_BINARY_PATH" - "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + "-USYSTEMD_BINARY_PATH" + "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - "-D__UAPI_DEF_ETHHDR=0" - ]); + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + "-D__UAPI_DEF_ETHHDR=0" + ] + ); doCheck = false; # fails a bunch of tests @@ -713,34 +779,43 @@ stdenv.mkDerivation (finalAttrs: { export DESTDIR=/ ''; - mesonInstallTags = lib.optionals buildLibsOnly [ "devel" "libudev" "libsystemd" ]; + mesonInstallTags = lib.optionals buildLibsOnly [ + "devel" + "libudev" + "libsystemd" + ]; - postInstall = lib.optionalString (!buildLibsOnly) '' - mkdir -p $out/example/systemd - mv $out/lib/{binfmt.d,sysctl.d,tmpfiles.d} $out/example - mv $out/lib/systemd/{system,user} $out/example/systemd + postInstall = + lib.optionalString (!buildLibsOnly) '' + mkdir -p $out/example/systemd + mv $out/lib/{binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd - rm -rf $out/etc/systemd/system + rm -rf $out/etc/systemd/system - # Fix reference to /bin/false in the D-Bus services. - for i in $out/share/dbus-1/system-services/*.service; do - substituteInPlace $i --replace /bin/false ${coreutils}/bin/false - done + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done - # For compatibility with dependents that use sbin instead of bin. - ln -s bin "$out/sbin" + # For compatibility with dependents that use sbin instead of bin. + ln -s bin "$out/sbin" - rm -rf $out/etc/rpm - '' + lib.optionalString (!withKernelInstall) '' - # "kernel-install" shouldn't be used on NixOS. - find $out -name "*kernel-install*" -exec rm {} \; - '' + lib.optionalString (!withDocumentation) '' - rm -rf $out/share/doc - '' + lib.optionalString (withKmod && !buildLibsOnly) '' - mv $out/lib/modules-load.d $out/example - '' + lib.optionalString withSysusers '' - mv $out/lib/sysusers.d $out/example - ''; + rm -rf $out/etc/rpm + '' + + lib.optionalString (!withKernelInstall) '' + # "kernel-install" shouldn't be used on NixOS. + find $out -name "*kernel-install*" -exec rm {} \; + '' + + lib.optionalString (!withDocumentation) '' + rm -rf $out/share/doc + '' + + lib.optionalString (withKmod && !buildLibsOnly) '' + mv $out/lib/modules-load.d $out/example + '' + + lib.optionalString withSysusers '' + mv $out/lib/sysusers.d $out/example + ''; # Avoid *.EFI binary stripping. # At least on aarch64-linux strip removes too much from PE32+ files: @@ -752,23 +827,29 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap in the correct path for LUKS2 tokens. - postFixup = lib.optionalString withCryptsetup '' - for f in bin/systemd-cryptsetup bin/systemd-cryptenroll; do - # This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so` - wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup - done - '' + lib.optionalString withBootloader '' - mv $out/dont-strip-me $out/lib/systemd/boot/efi - '' + lib.optionalString withUkify '' - # To cross compile a derivation that builds a UKI with ukify, we need to wrap - # ukify with the correct binutils. When wrapping, no splicing happens so we - # have to explicitly pull binutils from targetPackages. - wrapProgram $out/bin/ukify --prefix PATH : ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }:${placeholder "out"}/lib/systemd - ''; + postFixup = + lib.optionalString withCryptsetup '' + for f in bin/systemd-cryptsetup bin/systemd-cryptenroll; do + # This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so` + wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup + done + '' + + lib.optionalString withBootloader '' + mv $out/dont-strip-me $out/lib/systemd/boot/efi + '' + + lib.optionalString withUkify '' + # To cross compile a derivation that builds a UKI with ukify, we need to wrap + # ukify with the correct binutils. When wrapping, no splicing happens so we + # have to explicitly pull binutils from targetPackages. + wrapProgram $out/bin/ukify --prefix PATH : ${ + lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] + }:${placeholder "out"}/lib/systemd + ''; - disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) - # 'or p' is for manually specified buildPackages as they dont have __spliced - (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); + disallowedReferences = + lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) + # 'or p' is for manually specified buildPackages as they dont have __spliced + (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); passthru = { # The `interfaceVersion` attribute below points out the incompatibilities @@ -778,22 +859,35 @@ stdenv.mkDerivation (finalAttrs: { # needed - and therefore `interfaceVersion` should be incremented. interfaceVersion = 2; - inherit withBootloader withCryptsetup withEfi withFido2 withHostnamed withImportd withKmod - withLocaled withMachined withPortabled withTimedated withTpm2Tss withUtmp - util-linux kmod kbd; + inherit + withBootloader + withCryptsetup + withEfi + withFido2 + withHostnamed + withImportd + withKmod + withLocaled + withMachined + withPortabled + withTimedated + withTpm2Tss + withUtmp + util-linux + kmod + kbd + ; tests = { inherit (nixosTests) switchTest systemd-journal systemd-journal-gateway - systemd-journal-upload; + systemd-journal-upload + ; cross = let - systemString = - if stdenv.buildPlatform.isAarch64 - then "gnu64" - else "aarch64-multiplatform"; + systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"; in pkgsCross.${systemString}.systemd; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -831,11 +925,20 @@ stdenv.mkDerivation (finalAttrs: { ofl publicDomain ]; - maintainers = with lib.maintainers; [ flokli kloenk ]; - pkgConfigModules = [ "libsystemd" "libudev" "systemd" "udev" ]; + maintainers = with lib.maintainers; [ + flokli + kloenk + ]; + pkgConfigModules = [ + "libsystemd" + "libudev" + "systemd" + "udev" + ]; # See src/basic/missing_syscall_def.h - platforms = with lib.platforms; lib.intersectLists linux - (aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390); + platforms = + with lib.platforms; + lib.intersectLists linux (aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390); priority = 10; badPlatforms = [ # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 1287d3668ea9..8cc608dc228c 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -4,26 +4,33 @@ fetchFromGitHub, installShellFiles, nixosTests, + postgresql, }: buildGoModule rec { pname = "headscale"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE="; + hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI="; }; - # Merged post-v0.23.0, so should be removed with next release. - patches = [ ./patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch ]; + vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; - vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc="; + subPackages = [ "cmd/headscale" ]; - ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; + ldflags = [ + "-s" + "-w" + "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + nativeCheckInputs = [ postgresql ]; - nativeBuildInputs = [installShellFiles]; checkFlags = ["-short"]; postInstall = '' @@ -33,7 +40,7 @@ buildGoModule rec { --zsh <($out/bin/headscale completion zsh) ''; - passthru.tests = {inherit (nixosTests) headscale;}; + passthru.tests = { inherit (nixosTests) headscale; }; meta = with lib; { homepage = "https://github.com/juanfont/headscale"; @@ -56,6 +63,9 @@ buildGoModule rec { ''; license = licenses.bsd3; mainProgram = "headscale"; - maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley]; + maintainers = with maintainers; [ + kradalby + misterio77 + ]; }; } diff --git a/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch b/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch deleted file mode 100644 index d226bc99ceff..000000000000 --- a/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 6ba8990b0b982b261b0b549080a2f7f780cc70d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= -Date: Thu, 21 Nov 2024 06:28:45 +0200 -Subject: [PATCH] config: loosen up BaseDomain and ServerURL checks - -Requirements [here][1]: - -> OK: -> server_url: headscale.com, base: clients.headscale.com -> server_url: headscale.com, base: headscale.net -> -> Not OK: -> server_url: server.headscale.com, base: headscale.com -> -> Essentially we have to prevent the possibility where the headscale -> server has a URL which can also be assigned to a node. -> -> So for the Not OK scenario: -> -> if the server is: server.headscale.com, and a node joins with the name -> server, it will be assigned server.headscale.com and that will break -> the connection for nodes which will now try to connect to that node -> instead of the headscale server. - -Fixes #2210 - -[1]: https://github.com/juanfont/headscale/issues/2210#issuecomment-2488165187 ---- - hscontrol/types/config.go | 44 +++++++++++-- - hscontrol/types/config_test.go | 64 ++++++++++++++++++- - .../testdata/base-domain-in-server-url.yaml | 2 +- - 3 files changed, 102 insertions(+), 8 deletions(-) - -diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go -index 50ce2f075f4c..b10118aaeade 100644 ---- a/hscontrol/types/config.go -+++ b/hscontrol/types/config.go -@@ -28,8 +28,9 @@ const ( - maxDuration time.Duration = 1<<63 - 1 - ) - --var errOidcMutuallyExclusive = errors.New( -- "oidc_client_secret and oidc_client_secret_path are mutually exclusive", -+var ( -+ errOidcMutuallyExclusive = errors.New("oidc_client_secret and oidc_client_secret_path are mutually exclusive") -+ errServerURLSuffix = errors.New("server_url cannot be part of base_domain in a way that could make the DERP and headscale server unreachable") - ) - - type IPAllocationStrategy string -@@ -814,10 +815,10 @@ func LoadServerConfig() (*Config, error) { - // - DERP run on their own domains - // - Control plane runs on login.tailscale.com/controlplane.tailscale.com - // - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net) -- // -- // TODO(kradalby): remove dnsConfig.UserNameInMagicDNS check when removed. -- if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" && strings.Contains(serverURL, dnsConfig.BaseDomain) { -- return nil, errors.New("server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.") -+ if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" { -+ if err := isSafeServerURL(serverURL, dnsConfig.BaseDomain); err != nil { -+ return nil, err -+ } - } - - return &Config{ -@@ -910,6 +911,37 @@ func LoadServerConfig() (*Config, error) { - }, nil - } - -+// BaseDomain cannot be a suffix of the server URL. -+// This is because Tailscale takes over the domain in BaseDomain, -+// causing the headscale server and DERP to be unreachable. -+// For Tailscale upstream, the following is true: -+// - DERP run on their own domains. -+// - Control plane runs on login.tailscale.com/controlplane.tailscale.com. -+// - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net). -+func isSafeServerURL(serverURL, baseDomain string) error { -+ server, err := url.Parse(serverURL) -+ if err != nil { -+ return err -+ } -+ -+ serverDomainParts := strings.Split(server.Host, ".") -+ baseDomainParts := strings.Split(baseDomain, ".") -+ -+ if len(serverDomainParts) <= len(baseDomainParts) { -+ return nil -+ } -+ -+ s := len(serverDomainParts) -+ b := len(baseDomainParts) -+ for i := range len(baseDomainParts) { -+ if serverDomainParts[s-i-1] != baseDomainParts[b-i-1] { -+ return nil -+ } -+ } -+ -+ return errServerURLSuffix -+} -+ - type deprecator struct { - warns set.Set[string] - fatals set.Set[string] -diff --git a/hscontrol/types/config_test.go b/hscontrol/types/config_test.go -index e6e8d6c2e0b1..68a13f6c0f40 100644 ---- a/hscontrol/types/config_test.go -+++ b/hscontrol/types/config_test.go -@@ -1,6 +1,7 @@ - package types - - import ( -+ "fmt" - "os" - "path/filepath" - "testing" -@@ -141,7 +142,7 @@ func TestReadConfig(t *testing.T) { - return LoadServerConfig() - }, - want: nil, -- wantErr: "server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.", -+ wantErr: errServerURLSuffix.Error(), - }, - { - name: "base-domain-not-in-server-url", -@@ -337,3 +338,64 @@ tls_letsencrypt_challenge_type: TLS-ALPN-01 - err = LoadConfig(tmpDir, false) - assert.NoError(t, err) - } -+ -+// OK -+// server_url: headscale.com, base: clients.headscale.com -+// server_url: headscale.com, base: headscale.net -+// -+// NOT OK -+// server_url: server.headscale.com, base: headscale.com. -+func TestSafeServerURL(t *testing.T) { -+ tests := []struct { -+ serverURL, baseDomain, -+ wantErr string -+ }{ -+ { -+ serverURL: "https://example.com", -+ baseDomain: "example.org", -+ }, -+ { -+ serverURL: "https://headscale.com", -+ baseDomain: "headscale.com", -+ }, -+ { -+ serverURL: "https://headscale.com", -+ baseDomain: "clients.headscale.com", -+ }, -+ { -+ serverURL: "https://headscale.com", -+ baseDomain: "clients.subdomain.headscale.com", -+ }, -+ { -+ serverURL: "https://headscale.kristoffer.com", -+ baseDomain: "mybase", -+ }, -+ { -+ serverURL: "https://server.headscale.com", -+ baseDomain: "headscale.com", -+ wantErr: errServerURLSuffix.Error(), -+ }, -+ { -+ serverURL: "https://server.subdomain.headscale.com", -+ baseDomain: "headscale.com", -+ wantErr: errServerURLSuffix.Error(), -+ }, -+ { -+ serverURL: "http://foo\x00", -+ wantErr: `parse "http://foo\x00": net/url: invalid control character in URL`, -+ }, -+ } -+ -+ for _, tt := range tests { -+ testName := fmt.Sprintf("server=%s domain=%s", tt.serverURL, tt.baseDomain) -+ t.Run(testName, func(t *testing.T) { -+ err := isSafeServerURL(tt.serverURL, tt.baseDomain) -+ if tt.wantErr != "" { -+ assert.EqualError(t, err, tt.wantErr) -+ -+ return -+ } -+ assert.NoError(t, err) -+ }) -+ } -+} -diff --git a/hscontrol/types/testdata/base-domain-in-server-url.yaml b/hscontrol/types/testdata/base-domain-in-server-url.yaml -index 683e021837c9..2d6a4694a09a 100644 ---- a/hscontrol/types/testdata/base-domain-in-server-url.yaml -+++ b/hscontrol/types/testdata/base-domain-in-server-url.yaml -@@ -8,7 +8,7 @@ prefixes: - database: - type: sqlite3 - --server_url: "https://derp.no" -+server_url: "https://server.derp.no" - - dns: - magic_dns: true --- -2.47.0 - diff --git a/pkgs/servers/home-assistant/custom-components/mass/package.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix new file mode 100644 index 000000000000..eb9e6de01750 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/mass/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + async-timeout, + music-assistant-client, + pytestCheckHook, + pytest-asyncio, + pytest-cov-stub, + pytest-homeassistant-custom-component, + zeroconf, +}: + +buildHomeAssistantComponent rec { + owner = "music-assistant"; + domain = "mass"; + version = "2024.12.1"; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "hass-music-assistant"; + rev = version; + hash = "sha256-e2e59oG0PeQdq/Vg4ovjxpOQTXrDfQxFVkWZ63QkfRw="; + }; + + dependencies = [ + async-timeout + music-assistant-client + ]; + + ignoreVersionRequirement = [ "music-assistant-client" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-cov-stub + pytest-homeassistant-custom-component + zeroconf + ]; + + meta = with lib; { + description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players"; + homepage = "https://github.com/music-assistant/hass-music-assistant"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 69556f845e66..ec9d756e845c 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.11.2"; + version = "2025.01.8"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-Hy4LHEDp+WPpmWKQQqqLjQ0xSnShQg3a68g8NMJ9o2k="; + hash = "sha256-jvz9CtVCuNu3w/1ebXcI8GNRAWajm51F9SMf13cBhlw="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index dc7601afa8da..719f97dd4d12 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -1,4 +1,4 @@ -{ python3, fetchPypi, lib, overlay ? (_: _: {}) }: +{ python3, lib, overlay ? (_: _: {}) }: lib.fix (self: python3.override { inherit self; @@ -20,6 +20,14 @@ lib.fix (self: python3.override { [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ + django-allauth = super.django-allauth.overrideAttrs (new: { src, ... }: { + version = "0.63.6"; + src = src.override { + tag = new.version; + hash = "sha256-13/QbA//wyHE9yMB7Jy/sJEyqPKxiMN+CZwSc4U6okU="; + }; + }); + # the redis python library only supports hiredis 3+ from version 5.1.0 onwards hiredis = super.hiredis.overrideAttrs (new: { src, ... }: { version = "3.1.0"; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index a5e066e81225..57bc70f1a7a4 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.19.2"; - hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc="; + version = "2.19.3"; + hash = "sha256-WwT0cdLZJlVTTq8REuQrtYWdpRhqEDjYPHDy2oj8Edk="; }; mir_2_15 = common { diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 0091485c9246..10ee71c20832 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.3.4"; + version = "2.3.6"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-wPahjWTZLt5GapkOmGdGSicAmSGte2BHf6zZBHd7D3g="; + hash = "sha256-en30/vKZDlqRvQW3n5yeMwLrukObw0d+NfzmdWvfXZE="; }; - vendorHash = "sha256-EUeP7ysMnFeQO8Gaxhhonxk40cUv04MSiEDsaEcjTuM="; + vendorHash = "sha256-fhodh5EcvAX2fruwv0e9VNAti2jKa7kEDQCVSDFl48A="; ldflags = [ "-s" diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d12ba27586ca..624212f6efed 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchurl, nixosTests, - nextcloud28Packages, nextcloud29Packages, nextcloud30Packages, }: @@ -58,12 +57,6 @@ let }; in { - nextcloud28 = generic { - version = "28.0.14"; - hash = "sha256-SpN/GIJIZCbJcD5Z7EspP2Ib6NCAt/hQFvYpkDw68zY="; - packages = nextcloud28Packages; - }; - nextcloud29 = generic { version = "29.0.11"; hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 873ad1b3e11b..9cdc0c51e71a 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-gOOb++cylFsD7dSe5ZOBgTxLgO6Aa3om4q3Y79ElcfI=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.1/contacts-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-hqCDr7qEqsi8tZ9Woz9hsUm1HENK16FNz4pcQCto8S4=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.2/contacts-v6.0.2.tar.gz", + "version": "6.0.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -53,7 +53,7 @@ "hash": "sha256-yhUkB1IodvWOg2fl+gJW3x68YrG0+eyIrrlpXTFVAwE=", "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.3/deck-v1.13.3.tar.gz", "version": "1.13.3", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" @@ -70,9 +70,9 @@ ] }, "files_mindmap": { - "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", - "version": "0.0.31", + "hash": "sha256-vrOF0kdxpNW7ulD1SkOdz44e2uYXdZuDec/4sC5N4JA=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.32/files_mindmap-0.0.32.tar.gz", + "version": "0.0.32", "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", "homepage": "https://github.com/ACTom/files_mindmap", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", - "version": "4.3.4", + "hash": "sha256-J2xGGZ4fEUwpWeEi3swdr9bwl4iBgltHGxo9Bi+Tdus=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.5/forms-v4.3.5.tar.gz", + "version": "4.3.5", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -130,9 +130,9 @@ ] }, "integration_paperless": { - "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", - "version": "1.0.4", + "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", + "version": "1.0.5", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "hash": "sha256-59ra95yAOnHG+a6sSK6dJmmZ7qqUqtanfrw1jjpTjQ0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.17/mail-v3.7.17.tar.gz", - "version": "3.7.17", + "hash": "sha256-1Q4kIN1aX2S1mAPivuqTi6cPyUE0mrogQD5XCAwclOA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.18/mail-v3.7.18.tar.gz", + "version": "3.7.18", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -170,19 +170,19 @@ ] }, "music": { - "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", - "version": "2.0.1", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-Fmb22HEVcfOBjpVgbuDvYIQKYII+L5xBHI/+BvNsUOw=", + "url": "https://github.com/owncloud/music/releases/download/v2.1.1/music_2.1.1_for_nextcloud.tar.gz", + "version": "2.1.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-LnOu1zhD9sWlM81iQSdlClLRVyZFF3DLH6zrx1NYsr8=", - "url": "https://github.com/nextcloud/news/releases/download/25.1.2/news.tar.gz", - "version": "25.1.2", + "hash": "sha256-jJmF98mNAapZPEASoH5b/hFLFhcxW5a/1q86FFMawyI=", + "url": "https://github.com/nextcloud/news/releases/download/25.2.0/news.tar.gz", + "version": "25.2.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -200,9 +200,9 @@ ] }, "notify_push": { - "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", - "version": "0.7.0", + "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz", + "version": "1.0.0", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -220,9 +220,9 @@ ] }, "phonetrack": { - "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", - "version": "0.8.1", + "hash": "sha256-fEJSGG4P+OC5f8PTATHurdUb0vnMaqMh6wwcVB+VcsA=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz", + "version": "0.8.2", "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-l0oK9go7NVkTJCyC1sagWwZpa/R5ZQsXTOishNSpYuw=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.6/polls-v7.2.6.tar.gz", - "version": "7.2.6", + "hash": "sha256-AMsa0JNQXO/0g9m+Qr2tJbYrKmcQ1xxcgZzkk4x29IU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.9/polls-v7.2.9.tar.gz", + "version": "7.2.9", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -280,9 +280,9 @@ ] }, "spreed": { - "hash": "sha256-sCt3wVj0jbQyQtTK483AupJtb7a6+FWznpjLoz9mEaM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.11/spreed-v19.0.11.tar.gz", - "version": "19.0.11", + "hash": "sha256-8C2TopybeFczpaNQF3IWeVh3uPXmNjQ1mdcWTyYOsZw=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.12/spreed-v19.0.12.tar.gz", + "version": "19.0.12", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 054823aa021c..c0fba00dc0d3 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-T/B+L2dhCyUCMYEyUQDMOCeMOBASIW7/A7RPtCol5Kc=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.0.4/bookmarks-15.0.4.tar.gz", - "version": "15.0.4", + "hash": "sha256-KsRj0AjSQ1Z7ej+BPWLqP2LMGg7NnL7o8/mI4mTNJRs=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.0.5/bookmarks-15.0.5.tar.gz", + "version": "15.0.5", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-P536HKK0dX6LYX4GXu8hgOrbGnsJ8bY3Ou7aR2Hh51k=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.8/calendar-v5.0.8.tar.gz", - "version": "5.0.8", + "hash": "sha256-nroc7URZtN5LhGg4wYgr3wD0k8k3vYj9k/V4H0JF2C0=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.9/calendar-v5.0.9.tar.gz", + "version": "5.0.9", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-Slk10WZfUQGsYnruBR5APSiuBd3jh3WG1GIqKhTUdfU=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.2/contacts-v6.1.2.tar.gz", - "version": "6.1.2", + "hash": "sha256-5h94RmmJcM7P0Wjx/hHDbUA55x3H/klOjkmH3qxMbpQ=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.3/contacts-v6.1.3.tar.gz", + "version": "6.1.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -40,9 +40,9 @@ ] }, "cospend": { - "hash": "sha256-3Jbti6plql9O9kknhZOlpqDtwPI0SYlnXP1qr0ZNpDA=", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.7/cospend-3.0.7.tar.gz", - "version": "3.0.7", + "hash": "sha256-2RDkUNZVEACgen4tnJW4vljnWiq1gK5BHd1Vqpd4IIs=", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.8/cospend-3.0.8.tar.gz", + "version": "3.0.8", "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/cospend-nc", "licenses": [ @@ -50,10 +50,10 @@ ] }, "deck": { - "hash": "sha256-BiUu//ouJiQt/BhrDBH16yGHoH4Kzb260A7ALIqSyEk=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.2/deck-v1.14.2.tar.gz", - "version": "1.14.2", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "hash": "sha256-5R392ezG5mGn4wQSdlHxca73tsAdQGr3+mSv19j6AlU=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.3/deck-v1.14.3.tar.gz", + "version": "1.14.3", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" @@ -70,9 +70,9 @@ ] }, "files_mindmap": { - "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", - "version": "0.0.31", + "hash": "sha256-vrOF0kdxpNW7ulD1SkOdz44e2uYXdZuDec/4sC5N4JA=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.32/files_mindmap-0.0.32.tar.gz", + "version": "0.0.32", "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", "homepage": "https://github.com/ACTom/files_mindmap", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", - "version": "4.3.4", + "hash": "sha256-J2xGGZ4fEUwpWeEi3swdr9bwl4iBgltHGxo9Bi+Tdus=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.5/forms-v4.3.5.tar.gz", + "version": "4.3.5", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -110,9 +110,9 @@ ] }, "impersonate": { - "hash": "sha256-lPzWFv00dIKe7S5L4t0edvzMWsV4cqVArdCb3TLgeeM=", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.0/impersonate-v1.17.0.tar.gz", - "version": "1.17.0", + "hash": "sha256-LGA3m4vubYK9QPdv9E0eQ3R0hTLjuTgNcSAq4sZVUNU=", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.1/impersonate-v1.17.1.tar.gz", + "version": "1.17.1", "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", "homepage": "https://github.com/nextcloud/impersonate", "licenses": [ @@ -120,9 +120,9 @@ ] }, "integration_openai": { - "hash": "sha256-jAAsX9NA09rM5kWBrlfZXIdkF5Go2CIYAtxzKvYd4nM=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.2.0/integration_openai-v3.2.0.tar.gz", - "version": "3.2.0", + "hash": "sha256-Dc7E5c9/rX4xgk7+spbwNWed57TDaO5oVPW6WDTXz/k=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.3.0/integration_openai-v3.3.0.tar.gz", + "version": "3.3.0", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ @@ -130,9 +130,9 @@ ] }, "integration_paperless": { - "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", - "version": "1.0.4", + "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", + "version": "1.0.5", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -150,9 +150,9 @@ ] }, "maps": { - "hash": "sha256-CsffBLHjgL/DeXo8ryGKFzvQ/RA4V7hfuFdllDfL0yg=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.5.0/maps-1.5.0.tar.gz", - "version": "1.5.0", + "hash": "sha256-/uoM29jXqeOvOJBu3xhv+KgqPE7T03pV269fdr2Er+0=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-2-nightly/maps-1.6.0-2-nightly.tar.gz", + "version": "1.6.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -170,19 +170,19 @@ ] }, "music": { - "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", - "version": "2.0.1", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-Fmb22HEVcfOBjpVgbuDvYIQKYII+L5xBHI/+BvNsUOw=", + "url": "https://github.com/owncloud/music/releases/download/v2.1.1/music_2.1.1_for_nextcloud.tar.gz", + "version": "2.1.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-LnOu1zhD9sWlM81iQSdlClLRVyZFF3DLH6zrx1NYsr8=", - "url": "https://github.com/nextcloud/news/releases/download/25.1.2/news.tar.gz", - "version": "25.1.2", + "hash": "sha256-jJmF98mNAapZPEASoH5b/hFLFhcxW5a/1q86FFMawyI=", + "url": "https://github.com/nextcloud/news/releases/download/25.2.0/news.tar.gz", + "version": "25.2.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -200,9 +200,9 @@ ] }, "notify_push": { - "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", - "version": "0.7.0", + "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz", + "version": "1.0.0", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -220,9 +220,9 @@ ] }, "phonetrack": { - "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", - "version": "0.8.1", + "hash": "sha256-fEJSGG4P+OC5f8PTATHurdUb0vnMaqMh6wwcVB+VcsA=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz", + "version": "0.8.2", "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-l0oK9go7NVkTJCyC1sagWwZpa/R5ZQsXTOishNSpYuw=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.6/polls-v7.2.6.tar.gz", - "version": "7.2.6", + "hash": "sha256-AMsa0JNQXO/0g9m+Qr2tJbYrKmcQ1xxcgZzkk4x29IU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.9/polls-v7.2.9.tar.gz", + "version": "7.2.9", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -280,9 +280,9 @@ ] }, "spreed": { - "hash": "sha256-S5bl2wiuEiS4e1cnt5/R6zgFslDEnoEd9Bkl9H9ufE4=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.1/spreed-v20.1.1.tar.gz", - "version": "20.1.1", + "hash": "sha256-j2r0dJ5QYrGHFbCfuuyOmXR7oEN78Nagn5Qb8kzmknA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.3/spreed-v20.1.3.tar.gz", + "version": "20.1.3", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2effd687e8e4..6ef921211f7a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -146,52 +146,49 @@ let "lib" "man" ]; - outputChecks = - { - out = { - disallowedReferences = [ - "dev" - "doc" - "man" - ]; - disallowedRequisites = [ - stdenv'.cc - llvmPackages.llvm.out - ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); - }; - - lib = { - disallowedReferences = [ - "out" - "dev" - "doc" - "man" - ]; - disallowedRequisites = [ - stdenv'.cc - llvmPackages.llvm.out - ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); - }; - } - // lib.optionalAttrs (atLeast "14" && olderThan "15") { - # TODO: Make this unconditional via staging because of number of rebuilds. - doc = { - disallowedReferences = [ - "out" - "dev" - "man" - ]; - }; - - man = { - disallowedReferences = [ - "out" - "dev" - "doc" - ]; - }; + outputChecks = { + out = { + disallowedReferences = [ + "dev" + "doc" + "man" + ]; + disallowedRequisites = [ + stdenv'.cc + llvmPackages.llvm.out + ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); }; + lib = { + disallowedReferences = [ + "out" + "dev" + "doc" + "man" + ]; + disallowedRequisites = [ + stdenv'.cc + llvmPackages.llvm.out + ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); + }; + + doc = { + disallowedReferences = [ + "out" + "dev" + "man" + ]; + }; + + man = { + disallowedReferences = [ + "out" + "dev" + "doc" + ]; + }; + }; + strictDeps = true; buildInputs = @@ -247,9 +244,11 @@ let # flags will remove unused sections from all shared libraries and binaries - including # those paths. This avoids a lot of circular dependency problems with different outputs, # and allows splitting them cleanly. - env.CFLAGS = - "-fdata-sections -ffunction-sections" - + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + env = { + CFLAGS = + "-fdata-sections -ffunction-sections" + + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + } // lib.optionalAttrs pythonSupport { PYTHON = "${python3}/bin/python"; }; configureFlags = let @@ -378,10 +377,14 @@ let --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres" ''; - postFixup = lib.optionalString stdenv'.hostPlatform.isGnu '' - # initdb needs access to "locale" command from glibc. - wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin - ''; + postFixup = + lib.optionalString stdenv'.hostPlatform.isGnu '' + # initdb needs access to "locale" command from glibc. + wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin + '' + + lib.optionalString pythonSupport '' + wrapProgram "$out/bin/postgres" --set PYTHONPATH "${python3}/${python3.sitePackages}" + ''; # Running tests as "install check" to work around SIP issue on macOS: # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 1ed163690f89..99a753301d7e 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,7 +1,4 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # This is the builder for all X.org components. -source $stdenv/setup - # After installation, automatically add all "Requires" fields in the # pkgconfig files (*.pc) to the propagated build inputs. diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dbf5fef77576..83a61ee2529d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,9 +1,14 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -{ lib, pixman }: +{ + lib, + pixman, + luit, +}: self: with self; { inherit pixman; + inherit luit; # THIS IS A GENERATED FILE. DO NOT EDIT! appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: { @@ -1058,11 +1063,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libICE"; - version = "1.1.1"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libICE-1.1.1.tar.xz"; - sha256 = "0lg4sddalwmmzsnxv3fgdm2hzqp66j8b3syc0ancfhi9yzx7mrq3"; + url = "mirror://xorg/individual/lib/libICE-1.1.2.tar.xz"; + sha256 = "09c656nqkz3dpik012d2cwmd5a2dkxqgjpcq2v3v6pi22ka4wklp"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1078,11 +1083,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libSM"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libSM-1.2.4.tar.xz"; - sha256 = "113vx53k6pyxf84v5kqb7qhcldx1fi78lym77lcb2xhj9lgfbjzx"; + url = "mirror://xorg/individual/lib/libSM-1.2.5.tar.xz"; + sha256 = "1g10pn1zhcyc1ys8skp6p46gn6qgkif8kqdwlz1hsrzgllny3y9a"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1178,11 +1183,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXau"; - version = "1.0.11"; + version = "1.0.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXau-1.0.11.tar.xz"; - sha256 = "1sxv56rql3vsb14za0hgr07mipgvvcw48910srmky32pyn135ypk"; + url = "mirror://xorg/individual/lib/libXau-1.0.12.tar.xz"; + sha256 = "1yy0gx3psxyjcj284xhh44labav7b5zs7gcrks9xi6nklggy9l3l"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1538,11 +1543,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXrender"; - version = "0.9.11"; + version = "0.9.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXrender-0.9.11.tar.xz"; - sha256 = "096whakny5h16nlwz80z0l2nxigpsarl35mm5xqgzlc37ad7alxw"; + url = "mirror://xorg/individual/lib/libXrender-0.9.12.tar.xz"; + sha256 = "15qv3lbxyx61x55lwmafpy8idb836is82i1213bchfcblj6i4cmq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1618,11 +1623,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXv"; - version = "1.0.12"; + version = "1.0.13"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXv-1.0.12.tar.xz"; - sha256 = "0j1qqrhbhdi3kqz0am5i1lhs31ql9pbc14z41w0a5xw9yq4zmxxa"; + url = "mirror://xorg/individual/lib/libXv-1.0.13.tar.xz"; + sha256 = "0m9pl0xh0bv9y1x46d8a52bj46fsnyhzwa6qjg8zihg1b04r2d3x"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1698,11 +1703,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXxf86vm"; - version = "1.1.5"; + version = "1.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz"; - sha256 = "1rw8z01vgfc4wvf0q75sgnj6n04dkrw1w7z455qydrz0nd4fyzr4"; + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz"; + sha256 = "1qryzfzf3qr2xx1sipdn8kw310zs4ygpzgh4mm4m87fffd643bwn"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1818,11 +1823,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxcvt"; - version = "0.1.2"; + version = "0.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz"; - sha256 = "0f6vf47lay9y288n8yg9ckjgz5ypn2hnp03ipp7javkr8h2njq85"; + url = "mirror://xorg/individual/lib/libxcvt-0.1.3.tar.xz"; + sha256 = "009f8kr53cv7lzsg4507cgnk9vxyrm8lgnnn6vx7vpk7hy59jad9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1858,11 +1863,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxshmfence"; - version = "1.3.2"; + version = "1.3.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxshmfence-1.3.2.tar.xz"; - sha256 = "0vv0c7rjf6nd1afbal4c4ralallarak1v3ss3gcjdca0pibz43c7"; + url = "mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz"; + sha256 = "046y7zn8agp8kdr1lg11yyvpx90i9sjf77h25jhgx5msd84xz96l"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1915,26 +1920,6 @@ self: with self; { }; })) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! - luit = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { - pname = "luit"; - version = "20240910"; - builder = ./builder.sh; - src = fetchurl { - url = "https://invisible-mirror.net/archives/luit/luit-20240910.tgz"; - sha256 = "1ma978xdmkxm3q3v1cxpwzb4ahd0dgzj7v0ssr9i9bi5zk5pypd1"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - })) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! makedepend = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "makedepend"; @@ -4158,11 +4143,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.14"; + version = "21.1.15"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz"; - sha256 = "0dgfajrnkr8d61z1fjn249s3q1pm23v9w2f1aqb7sx64pp7048cg"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.15.tar.xz"; + sha256 = "12g0g9ksswzx1kgn23gvrpa570fnpkdkmw1dfqjjg4422a884744"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -4378,11 +4363,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrans = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrans"; - version = "1.5.1"; + version = "1.5.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/xtrans-1.5.1.tar.xz"; - sha256 = "0glr2vlhs56ij3px5829d00mv0ajnrf7ilminjai951wijyhza6y"; + url = "mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz"; + sha256 = "0v7qvys42md6nvm16xynhb3b8zz534fc60wg0hfi7ab48zivyp2w"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9fa149ffe1e3..95b47b5ed425 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -258,11 +258,16 @@ open OUT, ">default.nix"; print OUT ""; print OUT < -Date: Thu, 13 Jun 2019 21:27:42 +0200 -Subject: gpg: allow import of previously known keys, even without UIDs - -* g10/import.c (import_one): Accept an incoming OpenPGP certificate that -has no user id, as long as we already have a local variant of the cert -that matches the primary key. - --- - -This fixes two of the three broken tests in import-incomplete.scm. - -GnuPG-Bug-id: 4393 -Signed-off-by: Daniel Kahn Gillmor ---- - g10/import.c | 44 +++++++++++--------------------------------- - 1 file changed, 11 insertions(+), 33 deletions(-) - - -diff --git a/g10/import.c b/g10/import.c -index 9fab46ca6..61896a6bf 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -1954,7 +1954,6 @@ import_one_real (ctrl_t ctrl, - size_t an; - char pkstrbuf[PUBKEY_STRING_SIZE]; - int merge_keys_done = 0; -- int any_filter = 0; - KEYDB_HANDLE hd = NULL; - - if (r_valid) -@@ -1992,13 +1991,6 @@ import_one_real (ctrl_t ctrl, - } - - -- if (!uidnode) -- { -- if (!silent) -- log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); -- return 0; -- } -- - if (screener && screener (keyblock, screener_arg)) - { - log_error (_("key %s: %s\n"), keystr_from_pk (pk), -@@ -2078,18 +2070,10 @@ import_one_real (ctrl_t ctrl, - } - } - -- /* Delete invalid parts and bail out if there are no user ids left. */ -- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs)) -- { -- if (!silent) -- { -- log_error ( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); -- if (!opt.quiet) -- log_info(_("this may be caused by a missing self-signature\n")); -- } -- stats->no_user_id++; -- return 0; -- } -+ /* Delete invalid parts, and note if we have any valid ones left. -+ * We will later abort import if this key is new but contains -+ * no valid uids. */ -+ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs); - - /* Get rid of deleted nodes. */ - commit_kbnode (&keyblock); -@@ -2099,24 +2083,11 @@ import_one_real (ctrl_t ctrl, - { - apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); - commit_kbnode (&keyblock); -- any_filter = 1; - } - if (import_filter.drop_sig) - { - apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig); - commit_kbnode (&keyblock); -- any_filter = 1; -- } -- -- /* If we ran any filter we need to check that at least one user id -- * is left in the keyring. Note that we do not use log_error in -- * this case. */ -- if (any_filter && !any_uid_left (keyblock)) -- { -- if (!opt.quiet ) -- log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk)); -- stats->no_user_id++; -- return 0; - } - - /* The keyblock is valid and ready for real import. */ -@@ -2174,6 +2145,13 @@ import_one_real (ctrl_t ctrl, - err = 0; - stats->skipped_new_keys++; - } -+ else if (err && !any_uid_left (keyblock)) -+ { -+ if (!silent) -+ log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid)); -+ err = 0; -+ stats->no_user_id++; -+ } - else if (err) /* Insert this key. */ - { - /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY. */ diff --git a/pkgs/tools/security/gnupg/24-revert-rfc4880bis-defaults.patch b/pkgs/tools/security/gnupg/24-revert-rfc4880bis-defaults.patch deleted file mode 100644 index 8bc65ede79c0..000000000000 --- a/pkgs/tools/security/gnupg/24-revert-rfc4880bis-defaults.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 1e4f1550996334d2a631a5d769e937d29ace47bb Mon Sep 17 00:00:00 2001 -From: Jakub Jelen -Date: Thu, 9 Feb 2023 16:38:58 +0100 -Subject: [PATCH gnupg] Revert the introduction of the RFC4880bis draft into - defaults - -This reverts commit 4583f4fe2 (gpg: Merge --rfc4880bis features into ---gnupg, 2022-10-31). ---- - g10/gpg.c | 35 ++++++++++++++++++++++++++++++++--- - g10/keygen.c | 30 ++++++++++++++++++------------ - 2 files changed, 50 insertions(+), 15 deletions(-) - -diff --git a/g10/gpg.c b/g10/gpg.c -index dcab0a11a..796888013 100644 ---- a/g10/gpg.c -+++ b/g10/gpg.c -@@ -247,6 +247,7 @@ enum cmd_and_opt_values - oGnuPG, - oRFC2440, - oRFC4880, -+ oRFC4880bis, - oOpenPGP, - oPGP7, - oPGP8, -@@ -636,6 +637,7 @@ static gpgrt_opt_t opts[] = { - ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"), - ARGPARSE_s_n (oRFC2440, "rfc2440", "@"), - ARGPARSE_s_n (oRFC4880, "rfc4880", "@"), -+ ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"), - ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")), - ARGPARSE_s_n (oPGP7, "pgp6", "@"), - ARGPARSE_s_n (oPGP7, "pgp7", "@"), -@@ -978,7 +980,6 @@ static gpgrt_opt_t opts[] = { - ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"), - ARGPARSE_s_s (oNoop, "aead-algo", "@"), - ARGPARSE_s_s (oNoop, "personal-aead-preferences","@"), -- ARGPARSE_s_n (oNoop, "rfc4880bis", "@"), - ARGPARSE_s_n (oNoop, "override-compliance-check", "@"), - - -@@ -2227,7 +2228,7 @@ static struct gnupg_compliance_option compliance_options[] = - { - { "gnupg", oGnuPG }, - { "openpgp", oOpenPGP }, -- { "rfc4880bis", oGnuPG }, -+ { "rfc4880bis", oRFC4880bis }, - { "rfc4880", oRFC4880 }, - { "rfc2440", oRFC2440 }, - { "pgp6", oPGP7 }, -@@ -2243,8 +2244,28 @@ static struct gnupg_compliance_option compliance_options[] = - static void - set_compliance_option (enum cmd_and_opt_values option) - { -+ opt.flags.rfc4880bis = 0; /* Clear because it is initially set. */ -+ - switch (option) - { -+ case oRFC4880bis: -+ opt.flags.rfc4880bis = 1; -+ opt.compliance = CO_RFC4880; -+ opt.flags.dsa2 = 1; -+ opt.flags.require_cross_cert = 1; -+ opt.rfc2440_text = 0; -+ opt.allow_non_selfsigned_uid = 1; -+ opt.allow_freeform_uid = 1; -+ opt.escape_from = 1; -+ opt.not_dash_escaped = 0; -+ opt.def_cipher_algo = 0; -+ opt.def_digest_algo = 0; -+ opt.cert_digest_algo = 0; -+ opt.compress_algo = -1; -+ opt.s2k_mode = 3; /* iterated+salted */ -+ opt.s2k_digest_algo = DIGEST_ALGO_SHA256; -+ opt.s2k_cipher_algo = CIPHER_ALGO_AES256; -+ break; - case oOpenPGP: - case oRFC4880: - /* This is effectively the same as RFC2440, but with -@@ -2288,6 +2309,7 @@ set_compliance_option (enum cmd_and_opt_values option) - case oPGP8: opt.compliance = CO_PGP8; break; - case oGnuPG: - opt.compliance = CO_GNUPG; -+ opt.flags.rfc4880bis = 1; - break; - - case oDE_VS: -@@ -2491,6 +2513,7 @@ main (int argc, char **argv) - opt.emit_version = 0; - opt.weak_digests = NULL; - opt.compliance = CO_GNUPG; -+ opt.flags.rfc4880bis = 1; - - /* Check special options given on the command line. */ - orig_argc = argc; -@@ -3033,6 +3056,7 @@ main (int argc, char **argv) - case oOpenPGP: - case oRFC2440: - case oRFC4880: -+ case oRFC4880bis: - case oPGP7: - case oPGP8: - case oGnuPG: -@@ -3862,6 +3886,11 @@ main (int argc, char **argv) - if( may_coredump && !opt.quiet ) - log_info(_("WARNING: program may create a core file!\n")); - -+ if (!opt.flags.rfc4880bis) -+ { -+ opt.mimemode = 0; /* This will use text mode instead. */ -+ } -+ - if (eyes_only) { - if (opt.set_filename) - log_info(_("WARNING: %s overrides %s\n"), -@@ -4078,7 +4107,7 @@ main (int argc, char **argv) - /* Check our chosen algorithms against the list of legal - algorithms. */ - -- if(!GNUPG) -+ if(!GNUPG && !opt.flags.rfc4880bis) - { - const char *badalg=NULL; - preftype_t badtype=PREFTYPE_NONE; -diff --git a/g10/keygen.c b/g10/keygen.c -index a2cfe3ccf..2a1dd1f81 100644 ---- a/g10/keygen.c -+++ b/g10/keygen.c -@@ -404,7 +404,7 @@ keygen_set_std_prefs (const char *string,int personal) - strcat(dummy_string,"S7 "); - strcat(dummy_string,"S2 "); /* 3DES */ - -- if (!openpgp_aead_test_algo (AEAD_ALGO_OCB)) -+ if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB)) - strcat(dummy_string,"A2 "); - - if (personal) -@@ -889,7 +889,7 @@ keygen_upd_std_prefs (PKT_signature *sig, void *opaque) - /* Make sure that the MDC feature flag is set if needed. */ - add_feature_mdc (sig,mdc_available); - add_feature_aead (sig, aead_available); -- add_feature_v5 (sig, 1); -+ add_feature_v5 (sig, opt.flags.rfc4880bis); - add_keyserver_modify (sig,ks_modify); - keygen_add_keyserver_url(sig,NULL); - -@@ -3382,7 +3382,10 @@ parse_key_parameter_part (ctrl_t ctrl, - } - } - else if (!ascii_strcasecmp (s, "v5")) -- keyversion = 5; -+ { -+ if (opt.flags.rfc4880bis) -+ keyversion = 5; -+ } - else if (!ascii_strcasecmp (s, "v4")) - keyversion = 4; - else -@@ -3641,7 +3644,7 @@ parse_key_parameter_part (ctrl_t ctrl, - * ecdsa := Use algorithm ECDSA. - * eddsa := Use algorithm EdDSA. - * ecdh := Use algorithm ECDH. -- * v5 := Create version 5 key -+ * v5 := Create version 5 key (requires option --rfc4880bis) - * - * There are several defaults and fallbacks depending on the - * algorithm. PART can be used to select which part of STRING is -@@ -4513,9 +4516,9 @@ read_parameter_file (ctrl_t ctrl, const char *fname ) - } - } - -- if ((keywords[i].key == pVERSION -- || keywords[i].key == pSUBVERSION)) -- ; /* Ignore version. */ -+ if (!opt.flags.rfc4880bis && (keywords[i].key == pVERSION -+ || keywords[i].key == pSUBVERSION)) -+ ; /* Ignore version unless --rfc4880bis is active. */ - else - { - r = xmalloc_clear( sizeof *r + strlen( value ) ); -@@ -4610,11 +4613,14 @@ quickgen_set_para (struct para_data_s *para, int for_subkey, - para = r; - } - -- r = xmalloc_clear (sizeof *r + 20); -- r->key = for_subkey? pSUBVERSION : pVERSION; -- snprintf (r->u.value, 20, "%d", version); -- r->next = para; -- para = r; -+ if (opt.flags.rfc4880bis) -+ { -+ r = xmalloc_clear (sizeof *r + 20); -+ r->key = for_subkey? pSUBVERSION : pVERSION; -+ snprintf (r->u.value, 20, "%d", version); -+ r->next = para; -+ para = r; -+ } - - if (keytime) - { diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index b55417b60af3..79bb6a5e6a33 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -1,83 +1,145 @@ -{ lib, stdenv, fetchurl, buildPackages -, pkg-config, texinfo -, gettext, libassuan, libgcrypt, libgpg-error, libiconv, libksba, npth -, adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib -, enableMinimal ? false -, withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.hostPlatform.isDarwin, pinentry -, withTpm2Tss ? !stdenv.hostPlatform.isDarwin && !enableMinimal, tpm2-tss -, nixosTests +{ + lib, + stdenv, + fetchurl, + fetchFromGitLab, + buildPackages, + pkg-config, + texinfo, + gettext, + libassuan, + libgcrypt, + libgpg-error, + libiconv, + libksba, + npth, + adns, + bzip2, + gnutls, + libusb1, + openldap, + readline, + sqlite, + zlib, + enableMinimal ? false, + withPcsc ? !enableMinimal, + pcsclite, + guiSupport ? stdenv.hostPlatform.isDarwin, + pinentry, + withTpm2Tss ? !stdenv.hostPlatform.isDarwin && !enableMinimal, + tpm2-tss, + nixosTests, }: assert guiSupport -> !enableMinimal; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.4.5"; + version = "2.4.7"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-9o99ddBssWNcM2002ESvl0NsP2TqFLy3yGl4L5b0Qnc="; + hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkg-config texinfo ]; - buildInputs = [ - gettext libassuan libgcrypt libgpg-error libiconv libksba npth - ] ++ lib.optionals (!enableMinimal) [ - adns bzip2 gnutls libusb1 openldap readline sqlite zlib - ] ++ lib.optionals withTpm2Tss [ tpm2-tss ]; - - patches = [ - ./fix-libusb-include-path.patch - ./tests-add-test-cases-for-import-without-uid.patch - ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - ./24-allow-import-of-previously-known-keys-even-without-UI.patch - ./24-revert-rfc4880bis-defaults.patch - # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 - ./v3-0001-Disallow-compressed-signatures-and-certificates.patch + nativeBuildInputs = [ + pkg-config + texinfo + libgpg-error ]; + buildInputs = + [ + gettext + libassuan + libgcrypt + libgpg-error + libiconv + libksba + npth + ] + ++ lib.optionals (!enableMinimal) [ + adns + bzip2 + gnutls + libusb1 + openldap + readline + sqlite + zlib + ] + ++ lib.optionals withTpm2Tss [ tpm2-tss ]; - postPatch = '' - sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' + freepgPatches = fetchFromGitLab { + domain = "gitlab.com"; + owner = "freepg"; + repo = "gnupg"; + rev = "541772915dc4ec832c37f85bc629a22051f0e8f7"; + hash = "sha256-QOUY6EfJbTTN242BtzLojDgECGjUwbLfPJgzn/mj5L8="; + }; + + patches = + [ + ./fix-libusb-include-path.patch + ./CVE-2022-3219.patch + ] + ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [ + "0002-gpg-accept-subkeys-with-a-good-revocation-but-no-sel.patch" + "0003-gpg-allow-import-of-previously-known-keys-even-witho.patch" + "0004-tests-add-test-cases-for-import-without-uid.patch" + "0005-gpg-drop-import-clean-from-default-keyserver-import-.patch" + "0006-Do-not-use-OCB-mode-even-if-AEAD-OCB-key-preference-.patch" + "0007-Revert-the-introduction-of-the-RFC4880bis-draft-into.patch" + "0008-avoid-systemd-deprecation-warning.patch" + "0009-Add-systemd-support-for-keyboxd.patch" + "0010-doc-Remove-profile-and-systemd-example-files.patch" + ]; + + postPatch = + '' + sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 + '' + + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; - configureFlags = [ - "--sysconfdir=/etc" - "--with-libgpg-error-prefix=${libgpg-error.dev}" - "--with-libgcrypt-prefix=${libgcrypt.dev}" - "--with-libassuan-prefix=${libassuan.dev}" - "--with-ksba-prefix=${libksba.dev}" - "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" - ] - ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" - ++ lib.optional withTpm2Tss "--with-tss=intel" - ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-implicit-function-declaration"; - postInstall = if enableMinimal - then '' - rm -r $out/{libexec,sbin,share} - for f in $(find $out/bin -type f -not -name gpg) - do - rm $f - done - '' else '' - # add gpg2 symlink to make sure git does not break when signing commits - ln -s $out/bin/gpg $out/bin/gpg2 + configureFlags = + [ + "--sysconfdir=/etc" + "--with-libgpg-error-prefix=${libgpg-error.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" + ] + ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${ + pinentry.binaryPath or "bin/pinentry" + }" + ++ lib.optional withTpm2Tss "--with-tss=intel" + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; - # Make libexec tools available in PATH - for f in $out/libexec/; do - if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi - ln -s $f $out/bin/$(basename $f) - done + postInstall = + if enableMinimal then + '' + rm -r $out/{libexec,sbin,share} + for f in $(find $out/bin -type f -not -name gpg) + do + rm $f + done + '' + else + '' + # add gpg2 symlink to make sure git does not break when signing commits + ln -s $out/bin/gpg $out/bin/gpg2 - for f in $out/libexec/; do - if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi - ln -s $f $out/bin/$(basename $f) - done - ''; + # Make libexec tools available in PATH + for f in $out/libexec/; do + if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi + ln -s $f $out/bin/$(basename $f) + done + ''; enableParallelBuilding = true; @@ -99,7 +161,10 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ fpletz sgo ]; + maintainers = with maintainers; [ + fpletz + sgo + ]; platforms = platforms.all; mainProgram = "gpg"; }; diff --git a/pkgs/tools/security/gnupg/v3-0001-Disallow-compressed-signatures-and-certificates.patch b/pkgs/tools/security/gnupg/CVE-2022-3219.patch similarity index 100% rename from pkgs/tools/security/gnupg/v3-0001-Disallow-compressed-signatures-and-certificates.patch rename to pkgs/tools/security/gnupg/CVE-2022-3219.patch diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 8e808e18edd3..a6c8395b0a56 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -4,12 +4,10 @@ , autoreconfHook , libassuan , libgpg-error -, libiconv , makeBinaryWrapper , texinfo , common-updater-scripts , writers -, Cocoa }: stdenv.mkDerivation rec { @@ -38,10 +36,15 @@ stdenv.mkDerivation rec { (allow process-exec (literal "/usr/libexec/PlistBuddy")) ''; + strictDeps = true; nativeBuildInputs = [ autoreconfHook makeBinaryWrapper texinfo ]; - buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; - configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; + configureFlags = [ + "--enable-maintainer-mode" + "--disable-ncurses" + "--with-libgpg-error-prefix=${libgpg-error.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + ]; installPhase = '' mkdir -p $out/Applications $out/bin diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 47f97c5fd346..f962fb9f9eb6 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; in lib.optionalString (!stdenv.hostPlatform.isStatic) '' - ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} + ${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; diff --git a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix index 8758b394693f..d7ef01f0c9cc 100644 --- a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix +++ b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "nvidia-system-monitor-qt"; - version = "1.6"; + version = "1.6-1"; src = fetchFromGitHub { owner = "congard"; repo = "nvidia-system-monitor-qt"; rev = "v${version}"; - sha256 = "sha256-Gvg7MgCqvfiEfGDQJSR1v5uAB99ZULAuGPGCce/K7HE="; + sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg="; }; buildInputs = [ qtbase ]; diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 5eb1439ed0db..1a44af2d3eb8 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -1,7 +1,9 @@ { + lib, stdenv, fetchurl, mecab-nodic, + buildPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -16,8 +18,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ mecab-nodic ]; - configureFlags = [ - "--with-charset=utf8" - "--with-dicdir=${placeholder "out"}" - ]; + configureFlags = + [ + "--with-charset=utf8" + "--with-dicdir=${placeholder "out"}" + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--with-mecab-config=${lib.getExe' buildPackages.mecab "mecab-config"}" + ] + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--with-mecab-config=${lib.getExe' (lib.getDev mecab-nodic) "mecab-config"}" + ]; }) diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index f038b83ff7ad..971fed1a6151 100644 --- a/pkgs/tools/typesetting/tex/nix/animatedot.sh +++ b/pkgs/tools/typesetting/tex/nix/animatedot.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - mkdir -p $out for ((i = 1; i <= $nrFrames; i++)); do diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index 71cf601dfac0..c37e6a9868be 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - mkdir -p $out dot2pdf() { diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh index dd8de4a23dbc..687e6416ddc8 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - mkdir -p $out dot2ps() { diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh index bfef3df6b0e1..5e930125f875 100644 --- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh +++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - mkdir -p $out mkdir root diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 9c1807687284..f49e07676f30 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -1,5 +1,3 @@ -source $stdenv/setup - mkdir -p $out export VARTEXFONTS=$TMPDIR/texfonts diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index dc8d14793b75..e3dbda8ca457 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -48,18 +48,14 @@ stdenv.mkDerivation (finalAttrs: { done ''; + strictDeps = true; + # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. nativeBuildInputs = [ autoreconfHook makeWrapper - flex getopt - ]; - - buildInputs = [ - docbook_xml_dtd_45 - docbook_xsl libxml2 libxslt ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fa8a07f695dd..08a598b64105 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -898,6 +898,18 @@ mapAliases { neocities-cli = neocities; # Added 2024-07-31 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 + nextcloud28 = throw '' + Nextcloud v28 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2025-01. Please upgrade to at least Nextcloud v29 by declaring + + services.nextcloud.package = pkgs.nextcloud29; + + in your NixOS config. + + WARNING: if you were on Nextcloud 27 you have to upgrade to Nextcloud 28 + first on 24.11 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2025-01-19 + nextcloud28Packages = throw "Nextcloud 28 is EOL!"; # Added 2025-01-19 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring @@ -1494,6 +1506,7 @@ mapAliases { ### Z ### + zeromq4 = zeromq; # Added 2024-11-03 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6164d3bf725a..3a9d2decb85d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -768,7 +768,9 @@ with pkgs; cutoffPackages = [ newDependency ]; }; - replaceVars = callPackage ../build-support/replace-vars { }; + replaceVarsWith = callPackage ../build-support/replace-vars/replace-vars-with.nix { }; + + replaceVars = callPackage ../build-support/replace-vars/replace-vars.nix { }; replaceDirectDependencies = callPackage ../build-support/replace-direct-dependencies.nix { }; @@ -3306,19 +3308,6 @@ with pkgs; fastlane = callPackage ../tools/admin/fastlane { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - python = python3; - }); - fontforge-gtk = fontforge.override { - withSpiro = true; - withGTK = true; - gtk3 = gtk3-x11; - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - - fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix { }; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; fox = callPackage ../development/libraries/fox {}; @@ -4354,9 +4343,8 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud28 nextcloud29 nextcloud30; + nextcloud29 nextcloud30; - nextcloud28Packages = callPackage ../servers/nextcloud/packages { ncVersion = "28"; }; nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; }; nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; }; @@ -4699,9 +4687,7 @@ with pkgs; pinentry-tty pinentry-all; - pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { }; pingu = callPackage ../tools/networking/pingu { buildGoModule = buildGo122Module; @@ -4837,8 +4823,6 @@ with pkgs; mpi = openmpi; # this attribute should used to build MPI applications openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); - prowlarr = callPackage ../servers/prowlarr { }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { @@ -5572,9 +5556,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xtreemfs = callPackage ../tools/filesystems/xtreemfs { - boost = boost179; - }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs { }; xorriso = libisoburn; @@ -7887,6 +7869,11 @@ with pkgs; inherit (llvmPackages) llvm libclang; }; + daggerfall-unity-unfree = daggerfall-unity.override { + pname = "daggerfall-unity-unfree"; + includeUnfree = true; + }; + dbt = with python3Packages; toPythonApplication dbt-core; devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; @@ -8259,7 +8246,7 @@ with pkgs; inherit (regclient) regbot regctl regsync; - reno = with python311Packages; toPythonApplication reno; + reno = with python312Packages; toPythonApplication reno; replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { }; @@ -8390,9 +8377,7 @@ with pkgs; travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; + tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { }; tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars; @@ -8597,7 +8582,7 @@ with pkgs; boost187 ; - boost = boost186; + boost = boost187; inherit (callPackages ../development/libraries/botan { }) botan2 @@ -9316,7 +9301,12 @@ with pkgs; icu76 ; - icu = icu74; + # Use Apple’s fork of ICU by default, which provides additional APIs that are not present in upstream ICU. + # + # `icuReal` is provided in case the upstream icu package is needed on Darwin instead of the fork. + # Note that the versioned icu packages always correspond to the upstream versions. + icuReal = icu74; + icu = if stdenv.hostPlatform.isDarwin then darwin.ICU else icuReal; idasen = with python3Packages; toPythonApplication idasen; @@ -9580,17 +9570,17 @@ with pkgs; python = python3; }; - libffi = callPackage ../development/libraries/libffi { }; + # Use Apple’s fork of libffi by default, which provides APIs and trampoline functionality that is not yet + # merged upstream. This is needed by some packages (such as cffi). + # + # `libffiReal` is provided in case the upstream libffi package is needed on Darwin instead of the fork. + libffiReal = callPackage ../development/libraries/libffi { }; + libffi = if stdenv.hostPlatform.isDarwin then darwin.libffi else libffiReal; libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { }; libffiBoot = libffi.override { doCheck = false; }; - libfreefare = callPackage ../development/libraries/libfreefare { - inherit (darwin.apple_sdk.frameworks) IOKit Security; - inherit (darwin) libobjc; - }; - libftdi = callPackage ../development/libraries/libftdi { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; @@ -10208,21 +10198,21 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation; }; - openstackclient = with python311Packages; toPythonApplication python-openstackclient; + openstackclient = with python312Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins; }); - barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; - glanceclient = with python311Packages; toPythonApplication python-glanceclient; - heatclient = with python311Packages; toPythonApplication python-heatclient; - ironicclient = with python311Packages; toPythonApplication python-ironicclient; - magnumclient = with python311Packages; toPythonApplication python-magnumclient; - manilaclient = with python311Packages; toPythonApplication python-manilaclient; - mistralclient = with python311Packages; toPythonApplication python-mistralclient; - swiftclient = with python311Packages; toPythonApplication python-swiftclient; - troveclient = with python311Packages; toPythonApplication python-troveclient; - watcherclient = with python311Packages; toPythonApplication python-watcherclient; - zunclient = with python311Packages; toPythonApplication python-zunclient; + barbicanclient = with python312Packages; toPythonApplication python-barbicanclient; + glanceclient = with python312Packages; toPythonApplication python-glanceclient; + heatclient = with python312Packages; toPythonApplication python-heatclient; + ironicclient = with python312Packages; toPythonApplication python-ironicclient; + magnumclient = with python312Packages; toPythonApplication python-magnumclient; + manilaclient = with python312Packages; toPythonApplication python-manilaclient; + mistralclient = with python312Packages; toPythonApplication python-mistralclient; + swiftclient = with python312Packages; toPythonApplication python-swiftclient; + troveclient = with python312Packages; toPythonApplication python-troveclient; + watcherclient = with python312Packages; toPythonApplication python-watcherclient; + zunclient = with python312Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { }; @@ -10885,9 +10875,6 @@ with pkgs; stdenv; }; - zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix { }; - zeromq = zeromq4; - # requires a newer Apple SDK zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 { llvmPackages = llvmPackages_13; @@ -11110,17 +11097,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_9 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.9"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_4_10 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_10; + sbcl_2_4_11 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.11"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_4_11; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -12398,6 +12385,7 @@ with pkgs; withDocumentation = false; withEfi = false; withFido2 = false; + withGcrypt = false; withHostnamed = false; withHomed = false; withHwdb = false; @@ -12411,6 +12399,7 @@ with pkgs; withNetworkd = false; withNss = false; withOomd = false; + withOpenSSL = false; withPCRE2 = false; withPam = false; withPolkit = false; @@ -13419,6 +13408,7 @@ with pkgs; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio { python = python311; + boost = boost186; # fails with 187 }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; @@ -13722,10 +13712,6 @@ with pkgs; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - gramps = callPackage ../applications/misc/gramps { - pythonPackages = python3Packages; - }; - graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; @@ -15230,14 +15216,16 @@ with pkgs; inherit (ocaml-ng.ocamlPackages) stog; + # Stumpwm is broken on SBCL 2.4.11, see + # https://github.com/NixOS/nixpkgs/pull/360320 stumpwm = callPackage ../applications/window-managers/stumpwm { stdenv = stdenvNoCC; - sbcl = sbcl.withPackages (ps: with ps; [ + sbcl = sbcl_2_4_10.withPackages (ps: with ps; [ alexandria cl-ppcre clx fiasco ]); }; - stumpwm-unwrapped = sbclPackages.stumpwm; + stumpwm-unwrapped = sbcl_2_4_10.pkgs.stumpwm; sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); @@ -18332,7 +18320,7 @@ with pkgs; }; weasis = callPackage ../by-name/we/weasis/package.nix { - jre = jdk21; + jre = jdk23; }; sieveshell = with python3.pkgs; toPythonApplication managesieve; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c4ac336dd39c..7939e8df371c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -322,6 +322,8 @@ in { acpi_call = callPackage ../os-specific/linux/acpi-call {}; + ajantv2 = callPackage ../os-specific/linux/ajantv2 { }; + akvcam = callPackage ../os-specific/linux/akvcam { }; amneziawg = callPackage ../os-specific/linux/amneziawg { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f25dce5a4dd2..452913121d44 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5024,6 +5024,11 @@ with self; { url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz"; hash = "sha256-LbHrtYN7TLIAUcDuW3M7RFPjE33wqSMGA0yGdiHt1+c="; }; + patches = [ + # Fix build error with gcc14. See https://rt.cpan.org/Public/Bug/Display.html?id=133363. + # Source: https://rt.cpan.org/Public/Ticket/Attachment/1912753/1024508/0001-_des.h-expose-perl_des_expand_key-and-perl_des_crypt.patch + ../development/perl-modules/CryptDES-expose-perl_des_expand_key-and-perl_des_crypt.patch + ]; meta = { description = "Perl DES encryption module"; license = with lib.licenses; [ bsdOriginalShortened ]; @@ -29164,10 +29169,10 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.44"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.44.tar.gz"; - hash = "sha256-ohrnkiGSfvwR2J2MnbMt9swgsxacX2kuGSEUriNNdhI="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.46.tar.gz"; + hash = "sha256-ZaJyapEAeUma1LuDxBeAWdpDMGrpLIc0yPoXwC8ioB0="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28a3a37924f0..5a8874b6eeb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2652,6 +2652,8 @@ self: super: with self; { coordinates = callPackage ../development/python-modules/coordinates { }; + copykitten = callPackage ../development/python-modules/copykitten { }; + coreapi = callPackage ../development/python-modules/coreapi { }; coredis = callPackage ../development/python-modules/coredis { }; @@ -4507,6 +4509,8 @@ self: super: with self; { inherit (self) python; }); + fastmri = callPackage ../development/python-modules/fastmri { }; + fastnumbers = callPackage ../development/python-modules/fastnumbers { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; @@ -4865,7 +4869,7 @@ self: super: with self; { (pythonOlder "3.10") (toPythonModule (pkgs.fontforge.override { withPython = true; - inherit python; + python3 = python; })); fontmath = callPackage ../development/python-modules/fontmath { }; @@ -7731,6 +7735,8 @@ self: super: with self; { lrcalc-python = callPackage ../development/python-modules/lrcalc-python { }; + lrclibapi = callPackage ../development/python-modules/lrclibapi { }; + lru-dict = callPackage ../development/python-modules/lru-dict { }; lsassy = callPackage ../development/python-modules/lsassy { }; @@ -8499,6 +8505,8 @@ self: super: with self; { mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { }; + mpl-typst = callPackage ../development/python-modules/mpl-typst { }; + mpmath = callPackage ../development/python-modules/mpmath { }; mpris-server = callPackage ../development/python-modules/mpris-server { }; @@ -9979,6 +9987,8 @@ self: super: with self; { pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; + pandera = callPackage ../development/python-modules/pandera { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; pandoc-latex-environment = callPackage ../development/python-modules/pandoc-latex-environment { }; @@ -14416,6 +14426,8 @@ self: super: with self; { safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { }; + safehttpx = callPackage ../development/python-modules/safehttpx { }; + safeio = callPackage ../development/python-modules/safeio { }; safetensors = callPackage ../development/python-modules/safetensors { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 9e02fbbb1121..237a4757afb3 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -98,7 +98,7 @@ makeScopeWithSplicing' { qtspell = callPackage ../development/libraries/qtspell { }; qwlroots = callPackage ../development/libraries/qwlroots { - wlroots = pkgs.wlroots_0_17; + wlroots = pkgs.wlroots_0_18; }; qxlsx = callPackage ../development/libraries/qxlsx { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 492a7503a03d..ace9220040b2 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -13,7 +13,7 @@ */ { # The platforms *from* which we cross compile. - supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] + supportedSystems ? [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 819f694fbd11..e04a1f4a2ab8 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -89,7 +89,6 @@ let cholmod-extra = linux; colmap = linux; ctranslate2 = linux; - deepin.image-editor = linux; ffmpeg-full = linux; gimp = linux; gpu-screen-recorder = linux; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 32ca64052369..b5c34fe6ba07 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -23,7 +23,7 @@ let singleBinary = cmd: providers: let provider = providers.${stdenv.hostPlatform.parsed.kernel.name} or providers.linux; bin = "${getBin provider}/bin/${cmd}"; - manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; + manDir = "${getOutput "man" provider}/share/man"; in runCommand "${cmd}-${provider.name}" { meta = { mainProgram = cmd; @@ -43,9 +43,12 @@ let mkdir -p $out/bin ln -s ${bin} $out/bin/${cmd} - if [ -f ${manpage} ]; then - mkdir -p $out/share/man/man1 - ln -s ${manpage} $out/share/man/man1/${cmd}.1.gz + if [ -d ${manDir} ]; then + manpages=($(cd ${manDir} ; find . -name '${cmd}*')) + for manpage in "''${manpages[@]}"; do + mkdir -p $out/share/man/$(dirname $manpage) + ln -s ${manDir}/$manpage $out/share/man/$manpage + done fi '';