diff --git a/doc/interoperability/openxr.md b/doc/interoperability/openxr.md new file mode 100644 index 0000000000000..186b06d38c031 --- /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/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d01991784977d..9ad32a3d20fb6 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,7 +57,7 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias +9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias for `haskell.packages.ghc966`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. @@ -764,7 +764,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_14_0_0; + Cabal = self.Cabal_3_14_1_0; }) ``` diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 071358b994dd5..b06a8ab93a70f 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 5ec3b9799b2de..853b56f3c510f 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 @@ -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 91c563982d0ab..3dceccfee2686 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17251,6 +17251,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/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index 545c5773ff489..21c3686ad296a 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=. +#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable nixfmt-rfc-style -I nixpkgs=. # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. # See regenerate-hackage-packages.sh for details on the purpose of this script. @@ -13,5 +13,7 @@ commit="$(jq -r .commit.sha <<< "$head_info")" # extract commit timestamp and convert to date date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)" # generate nix expression from cabal file, replacing the version with the commit date -echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix -cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix +output=pkgs/development/haskell-modules/cabal2nix-unstable.nix +echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > "$output" +cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> "$output" +nixfmt "$output" diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 2430edbdd4204..e72b77ccd349a 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -8,7 +8,7 @@ set -eu -o pipefail # (should be capitalized like the display name) SOLVER=LTS # Stackage solver verson, if any. Use latest if empty -VERSION= +VERSION=22 TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER readonly VERSION diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 648f2f774ddfb..cc9a667ccccd0 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."); - -let format' = format; in let +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 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; - - 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 '' + 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}; + + 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 )) - - # 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 )) - - diskSize=$(( requiredFilesystemSpace + additionalSpace )) - - # 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 - - 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 - ''} + bootSize=$(round_to_nearest $(numfmt --from=iec '${bootSize}') $mebibyte) + bootSizeMiB=$(( bootSize / 1024 / 1024 ))MiB + + ${ + 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 )) + + # 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 block size. + # This ensures whole $blockSize bytes block sizes in the filesystem + # and helps towards aligning partitions optimally. + requiredFilesystemSpace=$(round_to_nearest $requiredFilesystemSpace ${blockSize}) + + diskSize=$(( requiredFilesystemSpace + additionalSpace )) + + # 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 - - 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 - - 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 - - ${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"} - ''} - - # 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)} - - # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. + 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"} + + # 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 + + # 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"} + ''} + + # 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 + )} + + # 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 - - # 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"} - ''} - '' + 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"} + ''} + '' ); 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 1a0017a1799a4..8fadc79a13dc7 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/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 85ad59698b20a..e4d03f39018e2 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/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 8d501f6866602..47c5e0de3f8b2 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/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index dd739798963c2..01c40663b2b5a 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/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index 8850d961e63d4..1405cbc3e8262 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 07a3788abf7d2..3a8bb5f28fdf2 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/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix index 9cb64a1495d5d..a5a5edd6deac4 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-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index 8c49b87db0604..348d3bbb80bf7 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 755ea259c425d..60b9fe901db0e 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 5c4974f32ae07..46abdec71db69 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 280d38ce32f48..ff7cf4777ddf0 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 beb887d0f3e5c..d72ea225fb24d 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 5e43b155038d9..af2cf5af85c45 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 55c3a1ebfa8ab..0000000000000 --- 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/grow-partition.nix b/nixos/tests/grow-partition.nix index c8eef519fb5c4..84ea1312a03e1 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/jenkins.nix b/nixos/tests/jenkins.nix index d7394c866c143..35762652778b0 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/pppd.nix b/nixos/tests/pppd.nix index e6e581c5d05f7..ad4927e9e67bc 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 1b7428590a4a8..6ae009f5362c5 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 871c66d5350e7..ab81ec0f370aa 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 d8dc1998c03b9..9e01aedca4060 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/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8d709faedf94a..e1fe7689a7fb2 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 5a90ea44a14c5..d89c9c65838ec 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 25fa6358bbd6a..fca9cf907db14 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 d4c96b31232d6..a9270da67d9f5 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/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index fbbfc835bdc38..11142a22b703e 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 ba7e41e8bf2bf..0d0d5716e2ed4 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/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 317ed3f73f28c..6375059ddef77 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 c2e25c45e7e4a..c16a6ef0d748b 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 34b460fecaa0a..2fa381aa484e0 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 241182b919d27..05d82f1ebf3ad 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,24 +21661,28 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20241127, - 1211 + 20241223, + 1448 ], "deps": [ "compat", "s" ], - "commit": "0dc7f1ec81fa70b3cafdc394413fe14fd3a413e4", - "sha256": "1p5f2lf6jlsvyh6zhd6drc2njadlkn73djrykridsphzh92q88k0" + "commit": "e1c0f5bb940b8149e0db414cc77c1ce504f5e3eb", + "sha256": "1s91r6zl5c4cbfp6ybz3r8i5kw200nqc92dsidf9wmbzz435m1ds" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "dcf42cb3178d7245d6d49de346d5e2b44e5b7498", - "sha256": "00bkzfaw3bqykcks610vk9wlpa2z360xn32bpsrycacwfv29j7g4" + "deps": [ + "compat", + "s" + ], + "commit": "0dc7f1ec81fa70b3cafdc394413fe14fd3a413e4", + "sha256": "1p5f2lf6jlsvyh6zhd6drc2njadlkn73djrykridsphzh92q88k0" } }, { @@ -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": "d2c1f94b6560d802755b010fcd4438068ddaa12f", + "sha256": "0773691jxyv039y407c8dppkky41b3icacavddcv9m8v481763b7" + }, + "stable": { + "version": [ + 3, + 3 ], "deps": [ "dash", "denote" ], - "commit": "3d4b43f73210444942c95ee5db8e9976dfc9a1d9", - "sha256": "0d141146dapmrq3gby6ggnvdcp87zqj0amja3yjc2wr6s1z906fh" + "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": "dade49afa9eb2700a02de0333935a28b39b15b7b", + "sha256": "0gfsxpb8lg2ylcvnd67b4n4z1bh9cv6bpx4vhhm1rmxaljskww2j" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], - "commit": "97ae8480c257ba573ca3d06dbf602f9b23c41d38", - "sha256": "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj" + "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": "6f19fda11de06f5f6c5b3732f056df762d685fcc", + "sha256": "1cjgn91yyha14qqw9gdv15d0a19mjlx5ixigrysks60r6jkzzphi" + }, + "stable": { + "version": [ + 0, + 0, + 4 ], - "commit": "6e096458416888a4f63cca0d6bc5965a052753c8", - "sha256": "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5" + "commit": "6f19fda11de06f5f6c5b3732f056df762d685fcc", + "sha256": "1cjgn91yyha14qqw9gdv15d0a19mjlx5ixigrysks60r6jkzzphi" } }, { @@ -45933,11 +46025,20 @@ "repo": "Lindydancer/font-lock-studio", "unstable": { "version": [ - 20220629, - 1909 + 20250104, + 1653 + ], + "commit": "fb932d8eb7d305ee4dcc6f29bb5e56cfb3fe9104", + "sha256": "0ssa62qm3zv0l9adz0bpi4iaixbi788ihh1qy5n41h6jzcjig4k4" + }, + "stable": { + "version": [ + 0, + 0, + 9 ], - "commit": "78472ae1f65721b4da17756ee7e506f3d0487033", - "sha256": "0gyzl2rz9kzrpvb3pfkcwbd0b7rxjxlklzc7zfh7ch6xxg0ghslw" + "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": "5f4ac265928bfd88765d057b44cebcef71a7aaf6", + "sha256": "0ag9qfdjrg6x7aip3drar4gnylgimnk30k24cd9a4i72500fc6qs" + }, + "stable": { + "version": [ + 0, + 0, + 3 ], - "commit": "2483f3d98dbcf7f1633f551cc3691f5659b4b942", - "sha256": "1a57fc8ylrdlqlywp81b71jd93hiwkxy6gxpi8358d6d4czslvq7" + "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": "aaa9ef1042e0084fb774b3ee4274e1f8edb4d35e", + "sha256": "0yvxjby4x9bgbbp2a3j44l96z0dgi3xmjc2jq72fjgm12gzjals8" + }, + "stable": { + "version": [ + 0, + 1, + 3 ], - "commit": "5a41a20cc44dfe4a9ea584354ed6dbc15dd92f46", - "sha256": "0jwwnypa0lx812p3dqqn9c05g27qavnvr23pzphydx9i15nz80g0" + "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": "b16b59afcdc53614e6c3c272d1eaea592a832f65", + "sha256": "01c4yf4frvmjgwdkci2nfi1a2gk3lcl49pksys4r0cngsqmrcxfk" + }, + "stable": { + "version": [ + 0, + 0, + 6 ], - "commit": "565fda9f5fdeb0598986174a07e9fb09f7604397", - "sha256": "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd" + "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": "d1f6d41e5c2fc4cc7a23f4e79fa3710fdc74ec61", + "sha256": "08vrssc30yhyagddajnl4cyc6ar4cldbihq4fr1n0yc8asw1cyfb" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], - "commit": "83942d18eae361998d24c1c523b308eea821f048", - "sha256": "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp" + "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 - ], - "deps": [ - "cl-lib" + 20241207, + 1539 ], - "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": "23b6397fd61db31689feacb4b7df2b1f64e69572", + "sha256": "13d72g9h33a8gkrw76nz6dzpalj91pp17707mqwz6zn0miyyzx9d" + }, + "stable": { + "version": [ + 1, + 0, + 1 ], - "commit": "83b7d3261e9a6aaffd8e97bc047b77a6131789ee", - "sha256": "09qdmdivvnwkslq124flgijvxlvix3spglmx8676fjz6gnyzd6zs" + "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": "4a428d544893e91835b625fab38fdac964dcff88", + "sha256": "1608krphhk9igwn4snc2xh4zlmbjfl968h5y27k2nag25g0igmv1" + }, + "stable": { + "version": [ + 0, + 0, + 2 ], - "commit": "7a4b76f664c4375e3d98e8af0a29270752c13701", - "sha256": "0xx954cyvzndj7fy6k203nlnhaxi6d0pn3xrvy287dh9ydklng0m" + "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/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7d33dfe0a01b8..d6a8185048bbb 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/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index 7608e5c57eb4d..faf4f2c307482 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/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index ce1b3521d046d..75f90b2f44313 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/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 3305653d025ff..0000000000000 --- 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 1cd9b2ec725f4..cfdd6b54d50b1 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/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index b6860396b0d3c..9b05d201f933a 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, + substitute, + fetchpatch, fetchurl, fetchFromGitHub, cmake, @@ -180,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/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 57779cb487d08..4ec161a897589 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 aed17b3461e28..de5ccce0025b2 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/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 975dfb4c3d937..29b695fd08489 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 b46872439d769..24f1524bad110 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 cb5b5fca22080..878439cb31a66 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 a3a3eddc52bce..944e45edac1bc 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 7953032b09a78..d416ff58e2cb9 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 @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 @@ sub isStorePath { 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 @@ sub addPkg { 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 @@ sub addPkg { 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 @@ sub addPkg { 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 ecbe3d477fa1a..9abd07e995259 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 da1a709684dac..a6120931381e5 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 b03097a49a0c4..2e569c15885e2 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 9ea46394e4b14..7ddd7a556d406 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 60e1e327274ac..8d4315350ad5b 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 4515e0e82f497..4542691ae93fc 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 7e4dde4a64c8b..ec66a43d6ff8e 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 39838db255a6e..f34e98fdcb0fc 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 489914a2a8b43..4bbff3d3f3cb0 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 95b193490a82d..90ed35fc17a93 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 e07a6a1a79dd1..bb03c865bedc3 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 fe828d0ada9d0..43462834b19ec 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 95176beea8c13..e112703773cdf 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 20dfde4b10d44..786b4c86ff504 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 1ddd111b15182..f41eab6b7e304 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 de929fad55a92..cace650df8413 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 e187747f14e6a..b8f18eeda32b1 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 e553446346de3..622ac81a46024 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 a82728ef1025c..0f142cdd3fa0a 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 2dabd2e722be8..8f5e710a435a6 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 58cfbb15babe6..722bae0243ea2 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 0149c5d487ace..defa8a7d9b8e3 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 b581b6e7d403f..b53c64e30525c 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/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 3339c2fd2ce5c..8cc8708211dcc 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 0088279ad9390..0000000000000 --- 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 0000000000000..14a1e6a8e1e3d --- /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 0000000000000..4c9241187b82f --- /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 697387f292ba7..bb70a559fe966 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 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 2eab2124e70be..899fc9e32e21f 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 e88931d0f383d..b39b56f4ccb5e 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 2c644233d0ac4..b6901e8950ac3 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/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 462f9d3eea16b..9d727e8d21ab9 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/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index f8ba34710dcb8..c5caee1a22e7c 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/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index 5edb2d6366b8f..cbae83d9d988c 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 0000000000000..d438ce16b0480 --- /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 2a1090302ee9e..cafb761ef8702 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 e69b8ede4004b..516c5ec79b064 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 680933ef9ec4a..fb5d64a39825a 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/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 05729f8aa8480..27e75d875a7c3 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240921"; + version = "20241124"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; + hash = "sha256-T2ZAYJHC+F6pZLI41p649xq0uqydykaHpxiDum3k3bI="; }; patches = [ diff --git a/pkgs/by-name/bo/boot/builder.sh b/pkgs/by-name/bo/boot/builder.sh index 4506e3f0f8615..cb4a7e82d08b1 100644 --- a/pkgs/by-name/bo/boot/builder.sh +++ b/pkgs/by-name/bo/boot/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 - boot_bin=$out/bin/boot mkdir -pv $(dirname $boot_bin) diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 8ed9b2723d188..88ec301bc3560 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -2,6 +2,7 @@ lib, stdenv, linuxHeaders, + buildPackages, libopcodes, libopcodes_2_38, libbfd, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ./include-asm-types-for-ppc64le.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ python3 bison diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix index 5122b08f67cbb..9cca09bcd5027 100644 --- a/pkgs/by-name/by/byacc/package.nix +++ b/pkgs/by-name/by/byacc/package.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "byacc"; - version = "20240109"; + version = "20241231"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz" ]; - hash = "sha256-8ol3eQFxifGpR1dwXvb24V3JII7wee6n8oq+xXfghEY="; + hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM="; }; configureFlags = [ diff --git a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff deleted file mode 100644 index 742b80c4f9d1e..0000000000000 --- a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index b766aee425..ad50e64ce6 100644 ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -466,13 +466,6 @@ if(ENABLE_IPV6 AND NOT WIN32) - - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) - set(use_core_foundation_and_core_services ON) -- -- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") -- if(NOT SYSTEMCONFIGURATION_FRAMEWORK) -- message(FATAL_ERROR "SystemConfiguration framework not found") -- endif() -- -- list(APPEND CURL_LIBS "-framework SystemConfiguration") - endif() - endif() - if(ENABLE_IPV6) -diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h -index f7ba7e92a5..e4663cbf36 100644 ---- a/Utilities/cmcurl/lib/curl_setup.h -+++ b/Utilities/cmcurl/lib/curl_setup.h -@@ -316,12 +316,6 @@ - * performing this task will result in a synthesized IPv6 address. - */ - #if defined(__APPLE__) && !defined(USE_ARES) --#include --#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 3b6a80a550c4e..cae5089ffdfc1 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/cu/curlMinimal/fix-eventfd-free.patch b/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch new file mode 100644 index 0000000000000..5b0979fd4cbdc --- /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 8cf36fea64b64..0000000000000 --- 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 d614be60b9e48..0000000000000 --- 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 22aa1e4d64f3d..9d670607d4c36 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/de/desktop-file-utils/setup-hook.sh b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh index 728070e345810..af6b3fab34ee8 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 cb6f419b03311..d4d5b333cac97 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 1a4e0a0f089b7..4a5c92f4a2c7a 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; - - 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"; - - # 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"; + replacements = { + inherit coreutils getopt runtimeShell; + + 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"; + + # 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/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index f964f7633d9ec..4c6da2efa0c28 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/ed/edencommon/glog-0.7.patch b/pkgs/by-name/ed/edencommon/glog-0.7.patch new file mode 100644 index 0000000000000..1c9431c58c862 --- /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 3623f1cbf71b9..77cc3653952d1 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 41e58b4cf308e..6c78a1c782487 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/envision/autopatchelf.patch b/pkgs/by-name/en/envision/autopatchelf.patch new file mode 100644 index 0000000000000..d1999e70cea6e --- /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 9cb51f82e5404..c8f621acd9875 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 0000000000000..23cff743614ca --- /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 b602e6270dd76..649564e6f8b54 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 0000000000000..263cce53baa93 --- /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 157a900789a19..3d09d856ef4fa 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 0000000000000..f82726384ac9c --- /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 e564965bf9567..0ee9b228d6eaf 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 0000000000000..08bcf0eac9d04 --- /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 1eca97e7d7c74..efe02f87dfcba 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="; }) + + # Replace distutils use in the build script + (fetchpatch { + name = "replace-distutils.patch"; + url = "https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81.patch"; + includes = [ "pyhook/CMakeLists.txt" ]; + hash = "sha256-3CEwC8vygmCztKRmeD45aZIqyoj8yk5CLwxX2SGP7z4="; + }) + # Fixes translation compatibility with gettext 0.22 (fetchpatch { - url = "https://github.com/fontforge/fontforge/commit/55d58f87ab1440f628f2071a6f6cc7ef9626c641.patch"; - hash = "sha256-rkYnKPXA8Ztvh9g0zjG2yTUCPd3lE1uqwvBuEd8+Oyw="; + 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="; }) - # https://github.com/fontforge/fontforge/pull/5423 - ./replace-distutils.patch + # 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 - ] + nativeBuildInputs = [ + pkg-config + cmake + ]; + + 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 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals withGUI [ + gtk3 + cairo + pango + ]; - cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] + 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 0000000000000..22b7057e9ac31 --- /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/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix index f4bc572b513db..7fb5dd5eb0103 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 0d3a8cc360eac..acd4ebe7fc4a5 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/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index ccf1daa72ffb7..d54d17a64433e 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/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 53cb4efe2f137..5556e85f8566e 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 9eabf8a679a9b..40336f2972836 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 762b49a68e952..ed30b55a60f4a 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/gn/gnumake42/package.nix b/pkgs/by-name/gn/gnumake42/package.nix index dc323447af9b0..2d7b0394a004b 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/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix index 9bde856311bc7..61b4ad9be4692 100644 --- a/pkgs/by-name/gp/gpick/package.nix +++ b/pkgs/by-name/gp/gpick/package.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0="; }) ]; + # https://github.com/thezbyg/gpick/pull/227 + postPatch = '' + sed '1i#include ' -i source/dynv/Types.cpp + ''; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 118646c619ae0..c4e6742558377 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/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 1bee6d3f44478..5481f4f62aeff 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/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 10b24a35a2e68..748727e61fe70 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 53c8a2de9bc45..ddd96ffb3042c 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/invidious/videojs.sh b/pkgs/by-name/in/invidious/videojs.sh index 31609db14eb3b..9272d0b0e2851 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/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix index ba38e333430d3..9722f53dba4ef 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 08771f9b19423..8feb2b25d2b54 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 2db418ecc0a79..4bf9cb4325b9c 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 61e8918017c2a..4d51f7d055645 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 54a415cb8353f..c23db4d772d01 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/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index d78841ef5c859..17af27ccd36be 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/libajantv2/device-info-list.patch b/pkgs/by-name/li/libajantv2/device-info-list.patch new file mode 100644 index 0000000000000..c4351ecee00c3 --- /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 0000000000000..d27e9b7495da8 --- /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 4b0366d20c52f..ef582206401e6 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 db5603ac4aea1..4a33fb314bb6c 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 5a20a66514312..a26adf10b65ef 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 0ff2901229459..f648e896d262f 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/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index bb81836e131ae..050f3cd6b4881 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/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix index 2dee6c721bc1a..dec30fe9d0d41 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 2040ef3bee082..fc7584e484df1 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 4925fc1a9e31a..2c9cecbf894cb 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "fallible_collections" -version = "0.4.9" +version = "1.13.0" 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "proc-macro2" -version = "1.0.82" +version = "1.20.2" 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 f4e3512bdb768..d1e3c6e4470c8 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/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix index 053f0113b4448..eaa5943ffe148 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 da1b8609bf81f..e022b534cf8e5 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/libtiff/headers.patch b/pkgs/by-name/li/libtiff/headers.patch deleted file mode 100644 index 933e06f32326e..0000000000000 --- 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 674369df1cd07..03564fced8022 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 04fa1bfc88c72..f5c9ec2811cab 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 0000000000000..0eecc5d149b8a --- /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 425c2969da215..fd184de096670 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 859715f70d397..0000000000000 --- 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 75c61995071e2..37ced1abc20f1 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 0000000000000..cc4fdf88e48fc --- /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 abd1e1bd9afe9..c47827091eba2 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/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 6973d50e99aa9..9a4ce5ee4935e 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 0000000000000..8be9df590ad74 --- /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/m1/m17n_db/package.nix b/pkgs/by-name/m1/m17n_db/package.nix index ef3dd0e02ee63..676c88568eb43 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/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index c52bbe75e7fc1..1ac5f00e81adf 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 52dee4aa95dd2..6188c9e3a044f 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 c55dc369929a1..d4bd67c4b4948 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/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index b0bc9b7bcf050..93839bb440234 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 d8a420ae0d923..652a4a072bcd8 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 e0356bd4189b8..158451304a34a 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 5e3645598aa76..6e62e6a5e70ad 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 2b0af834bf2c0..20c46046506de 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 f1428848fbc32..de18e7e5c5438 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 d794719fea3c2..1bbb14572e2aa 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 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 0000000000000..0f72a615b98ee --- /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 b6df17c6a5a7f..0179fa3621e71 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/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index ff4d4bfa88c68..86a223f5cbef9 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 fc8b4f403e94c..0de2fe24c7f1c 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 5e504eca749ae..d6375f5db66f3 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 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 e8b2f1dc88e59..eddcb03f7902d 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 906c5b0e0b90b..c57a7858110a1 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 38fe2de663fd3..4839b3a340533 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 7ffc2984ef038..babc3b14ad65c 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/on/oniguruma/package.nix b/pkgs/by-name/on/oniguruma/package.nix index 33c79220dd2d0..4f6e11d6a0ad2 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/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix index 90dc1883eb9da..198813d3f6c03 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/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index a78fafad92756..dcf1fad292ebf 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/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix index b671e5880c5a8..4a1f18db99824 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 7c06eca325e91..2cb5569135a58 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/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index f2737b1a28b94..9cd87b629e463 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 dee0ab51a5212..56612ad5d0f02 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 6a515a4d72ca6..6017e0430f90a 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 b0a2b2a111842..a52bdec5480f3 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/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index 2b4e3922a55de..02859a9bc8139 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/rp/rpmextract/package.nix b/pkgs/by-name/rp/rpmextract/package.nix index 5decce67d5aaf..71630ed687c11 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 4ecddd6b68afd..3836c3462d261 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/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 656a02a4147e2..2f327ea9e768b 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/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 6420ff34f3ed7..3f28c4d6ee8a2 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 3a6c450449fd3..31e272b7edae2 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 803376c2b3e74..bc683d7bb9c7c 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/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 1410945e6f633..2efbe1244772d 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 0c9777b1ca880..802c8fe5f0d73 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/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 05a182ac80633..5c92b8ac58486 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 22338889b02cf..fe1f55ce5c94e 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/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index e2a4ac7b62962..55b82abe03350 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/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 28159f7f8fa91..0727406f509fb 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/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index ffcb59febd876..99086e0f27887 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/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 0b94d331b40f7..96ad2fa8407ec 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 0000000000000..c80c13d8f78f4 --- /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 d5d83869bfabd..5d1a723a1b829 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/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 09cd62514f5a2..8e5f4543a1fc3 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 0000000000000..30eaa67b424ef --- /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 b4a1902f03107..50d155809a400 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/wt/wtk/builder.sh b/pkgs/by-name/wt/wtk/builder.sh index ca5157c6d71ab..5e90f63c7cbaa 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 a436a59aead79..ddd820c145f54 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 - ''; - - 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") - ] + 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 ]; + + 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"; - - 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"} - ) - ''; + ++ 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") + ]; + + 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 fc5e798306640..84383093528ca 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 0000000000000..d1533e0b87b1d --- /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/xorg_sys_opengl/builder.sh b/pkgs/by-name/xo/xorg_sys_opengl/builder.sh index ed2c60da26121..d341e5be2a5f5 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 13670978ec0bd..f00ad24866019 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 f9a2e0151f6a9..c467b38928eac 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 59bb68a3136c3..684af9642b1b6 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 b0056602c387c..aca6cf21cbe56 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/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 6801eddc178f0..845aef375bc5a 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 1beba7163aeb6..6b80713075de6 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 0000000000000..c212a63f1bcc3 --- /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 d645c12600173..95dcc01916e68 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/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d3f4c4f2eb606..15b1528316f8d 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/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index dcff9e8cb4044..f753959e74206 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz", - "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn", - "msg": "Update from Hackage at 2024-10-25T11:10:52Z" + "commit": "c9ce1cc4a029220ec3582fbcf69e082d245d78b6", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c9ce1cc4a029220ec3582fbcf69e082d245d78b6.tar.gz", + "sha256": "02x3z4rg4dwarzb6p88z7sff40bkbq41gxnczvzph8s3s8jq9iw1", + "msg": "Update from Hackage at 2024-12-23T18:27:47Z" } 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 73be2eb5960aa..d20895fd12bad 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 ba15b58816020..ff02d6156ea2e 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 78535382a7ca5..a443d2d7b495d 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 8a8600f1f639f..041c471d79c09 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 568c3094107a3..21e5c0ffafe8d 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 9fed8ab057ce9..2968763637cc2 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 5d680574ad230..c4a20e7af4bcf 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 f6a4337d8622d..c0d9e2b371f76 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -557,16 +557,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 9e205aa0796d7..dc425f8858058 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 73873ec823a06..c5a704e8ad869 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.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix deleted file mode 100644 index cffbfef1524eb..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.5"; - sha256 = "6256cf9caf6d6dc7b611dcfbb247df2d528e85aa39d22a698e870e5a590e8601"; -} diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix deleted file mode 100644 index 0d37ba97fdb60..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.6"; - sha256 = "1b705cf52692f9d4d6707cdf8e761590f5f56ec8ea6a65e36610db392d3d24b9"; -} diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 96bf217884b6a..ef4828814854a 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 3ea73b14653a0..4b2f4337b0d10 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -620,16 +620,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 d4cb0f706572a..29d60dc24455d 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -569,16 +569,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 388b10a02d02c..85c9be094a0da 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 4eef8acb06934..551db285a98f7 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 1662aa52dde2b..9bc078df0e444 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 1552eb3993dcf..7afa284c25a2d 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 50c8a3c96834a..f72af0f085567 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 102a43161e3d8..c56a8fee14769 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 630fc7dda43c3..f3828cd0b0ffa 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 d8154025254f5..49371bb24883a 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 a1a7ff535433b..2e248209819a5 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 b35a05320a5c8..8f2f28c72c65f 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 0000000000000..49cbcb0af2ca6 --- /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 606cb70dc3cce..569c0e2dd0d0c 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 34632bf4b50d6..29d337a3310bd 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/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index cfa7b7d335234..2988834da8203 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -34,10 +34,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-12-04"; + version = "unstable-2024-12-31"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz"; - sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp"; + url = "https://github.com/NixOS/cabal2nix/archive/e290b906f056dd1414ede71b4bb6375be2d0aa5d.tar.gz"; + sha256 = "0x94w4dfjfxp3f5h7w5738znkyb8barzjki0xsf94asiffiqsgxn"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e7c2539c1d32c..1f4fb42885cdd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -19,8 +19,8 @@ in with haskellLib; self: super: { - # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 - dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); + # https://github.com/ivanperez-keera/dunai/issues/427 + dunai = addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai); # Make sure that Cabal_* can be built as-is Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { @@ -29,15 +29,15 @@ self: super: { Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { Cabal-syntax = self.Cabal-syntax_3_12_1_0; }); - Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { - Cabal-syntax = self.Cabal-syntax_3_14_0_0; + Cabal_3_14_1_0 = doDistribute (super.Cabal_3_14_1_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_1_0; }); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only - # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 + # makes sense to use the non Stackage version if we want to use Cabal* >= 3.14 hackage-security_0_6_2_6 = super.hackage-security_0_6_2_6.override { - Cabal = self.Cabal_3_12_1_0; - Cabal-syntax = self.Cabal-syntax_3_12_1_0; + Cabal = self.Cabal_3_14_1_0; + Cabal-syntax = self.Cabal-syntax_3_14_1_0; }; # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -48,9 +48,9 @@ self: super: { cabalInstallOverlay = cself: csuper: { hackage-security = self.hackage-security_0_6_2_6; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10.2") { - Cabal = cself.Cabal_3_12_1_0; - Cabal-syntax = cself.Cabal-syntax_3_12_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") { + Cabal = cself.Cabal_3_14_1_0; + Cabal-syntax = cself.Cabal-syntax_3_14_1_0; }; in { @@ -166,9 +166,10 @@ self: super: { # https://github.com/lspitzner/czipwith/issues/5 czipwith = doJailbreak super.czipwith; - # jacinda needs latest version of alex + # jacinda needs latest version of alex and happy jacinda = super.jacinda.override { alex = self.alex_3_5_1_0; + happy = self.happy_2_1_3; }; # 2024-07-09: rhine 1.4.* needs newer monad-schedule than stackage (and is only consumer) @@ -202,6 +203,11 @@ self: super: { http-api-data = doJailbreak super.http-api-data; tasty-discover = doJailbreak super.tasty-discover; + # Too strict lower bound on lens, drop with LTS 23 + provide = doJailbreak super.provide; + # Too strict bounds on quickcheck-instances/tasty-qickcheck, drop with LTS 23 + lawful-conversions = doJailbreak super.lawful-conversions; + # Out of date test data: https://github.com/ocharles/weeder/issues/176 weeder = appendPatch (pkgs.fetchpatch { name = "weeder-2.9.0-test-fix-expected.patch"; @@ -264,9 +270,6 @@ self: super: { termbox-bindings-c = appendConfigureFlags [ "--ghc-option=-optc=-Wno-error=implicit-function-declaration" ] super.termbox-bindings-c; - libxml-sax = appendConfigureFlags [ - "--ghc-option=-optc=-Wno-error=implicit-function-declaration" - ] super.libxml-sax; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; @@ -274,13 +277,7 @@ self: super: { # currently, cabal-plan seems to get not much maintenance cabal-plan = doJailbreak super.cabal-plan; - # test dependency has incorrect upper bound but still supports the newer dependency - # https://github.com/fused-effects/fused-effects/issues/451 - # https://github.com/fused-effects/fused-effects/pull/452 - fused-effects = doJailbreak super.fused-effects; - # support for transformers >= 0.6 - fused-effects-random = doJailbreak super.fused-effects-random; fused-effects-readline = doJailbreak super.fused-effects-readline; leveldb-haskell = overrideCabal (drv: { @@ -389,6 +386,11 @@ self: super: { # As well as deepseq < 1.5 (so it forbids GHC 9.8) hw-fingertree = doJailbreak super.hw-fingertree; + # Test suite is slow and sometimes comes up with counter examples. + # Upstream is aware (https://github.com/isovector/nspace/issues/1), + # if it's a bug, at least doesn't seem to be nixpkgs-specific. + nspace = dontCheck super.nspace; + # 2024-03-10: Maintainance stalled, fixes unmerged: https://github.com/haskell/ThreadScope/pull/130 threadscope = overrideCabal (drv: { prePatch = drv.prePatch or "" + '' @@ -457,7 +459,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-hPZTcl3kWeUnSVYOE1W+FDwR3LYg6gaJfEBIY6VSfxY="; + sha256 = "0jr4crq52qvnn85qxw077bdpzrgvamm7fmrqn6ygrhlyk1lb9n9x"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -505,6 +507,10 @@ self: super: { # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; + # Too strict bounds on hspec + # https://github.com/illia-shkroba/pfile/issues/2 + pfile = doJailbreak super.pfile; + # Manually maintained cachix-api = overrideCabal (drv: { version = "1.7.5"; @@ -928,9 +934,6 @@ self: super: { # https://github.com/nomeata/tasty-expected-failure/issues/21 tasty-expected-failure = dontCheck super.tasty-expected-failure; - # Waiting on https://github.com/RaphaelJ/friday/pull/36 - friday = doJailbreak super.friday; - # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; @@ -1286,17 +1289,11 @@ self: super: { # 2023-07-14: Restrictive upper bounds: https://github.com/luke-clifton/shh/issues/76 shh = doJailbreak super.shh; - # This package refers to the wrong library (itself in fact!) - vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; - # Compiles some C or C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; # dontCheck can be removed on the next package set bump vulkan-utils = dontCheck (addExtraLibrary pkgs.vulkan-headers super.vulkan-utils); - # https://github.com/dmwit/encoding/pull/3 - encoding = doJailbreak (appendPatch ./patches/encoding-Cabal-2.0.patch super.encoding); - # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; @@ -1330,13 +1327,14 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries - pantry = lself.pantry_0_10_0; - static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0 tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to # keep the same hpack version in Nixpkgs. - hpack = self.hpack_0_37_0; + hpack = lself.hpack_0_37_0; + + # stack-3.1.1 requires >= 0.10 + pantry = lself.pantry_0_10_0; }); # hslua has tests that break when using musl. @@ -1401,13 +1399,9 @@ self: super: { beam-postgres = lib.pipe super.beam-postgres [ # Requires pg_ctl command during tests (addTestToolDepends [pkgs.postgresql]) - (dontCheckIf (!pkgs.postgresql.doCheck)) + (dontCheckIf (!pkgs.postgresql.doCheck || !self.testcontainers.doCheck)) ]; - # Requires pqueue <1.5 but it works fine with pqueue-1.5.0.0 - # https://github.com/haskell-beam/beam/pull/705 - beam-migrate = doJailbreak super.beam-migrate; - users-postgresql-simple = addTestToolDepends [ pkgs.postgresql pkgs.postgresqlTestHook @@ -1492,10 +1486,6 @@ self: super: { # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; - # too strict bounds on text in the test suite - # https://github.com/audreyt/string-qq/pull/3 - string-qq = doJailbreak super.string-qq; - # Remove for hail > 0.2.0.0 hail = overrideCabal (drv: { patches = [ @@ -1958,10 +1948,6 @@ self: super: { hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; - # Test suite doesn't compile with aeson 2.0 - # https://github.com/hercules-ci/hercules-ci-agent/pull/387 - hercules-ci-api-agent = dontCheck super.hercules-ci-api-agent; - hercules-ci-cli = lib.pipe super.hercules-ci-cli [ unmarkBroken (overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) @@ -1977,9 +1963,6 @@ self: super: { sha256 = "sha256-kFV6CcwKdMq+qSgyc+eIApnaycq5A++pEEVr2A9xvts="; }) super.pipes-aeson; - # 2024-09-18: transformers <0.6 https://github.com/Gabriella439/Haskell-Pipes-Extras-Library/pull/19 - pipes-extras = assert super.pipes-extras.version == "1.0.15"; doJailbreak super.pipes-extras; - moto-postgresql = appendPatches [ # https://gitlab.com/k0001/moto/-/merge_requests/3 (fetchpatch { @@ -2019,18 +2002,18 @@ self: super: { # Pandoc 3.5 improves the quality of PDF rendering in Quarto >=1.6.30. # https://github.com/NixOS/nixpkgs/pull/349683 - pandoc-cli_3_5 = super.pandoc-cli_3_5.overrideScope ( + pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope ( self: super: { doclayout = self.doclayout_0_5; hslua-module-doclayout = self.hslua-module-doclayout_1_2_0; lpeg = self.lpeg_1_1_0; - pandoc = self.pandoc_3_5; - pandoc-lua-engine = self.pandoc-lua-engine_0_3_3; - pandoc-server = self.pandoc-server_0_1_0_9; - texmath = self.texmath_0_12_8_11; + pandoc = self.pandoc_3_6; + pandoc-lua-engine = self.pandoc-lua-engine_0_4; + pandoc-server = self.pandoc-server_0_1_0_10; + texmath = self.texmath_0_12_8_12; tls = self.tls_2_0_6; toml-parser = self.toml-parser_2_0_1_0; - typst = self.typst_0_6; + typst = self.typst_0_6_1; typst-symbols = self.typst-symbols_0_1_6; } ); @@ -2119,10 +2102,6 @@ self: super: { # https://github.com/noinia/hgeometry/commit/a6abecb1ce4a7fd96b25cc1a5c65cd4257ecde7a#commitcomment-49282301 hgeometry-combinatorial = dontCheck (doJailbreak super.hgeometry-combinatorial); - # Too strict version bounds on ansi-terminal - # https://github.com/kowainik/co-log/pull/218 - co-log = doJailbreak super.co-log; - # Test suite has a too strict bound on base # https://github.com/jswebtools/language-ecmascript/pull/88 # Test suite doesn't compile anymore @@ -2136,12 +2115,6 @@ self: super: { # https://github.com/faylang/fay/pull/474 fay = doJailbreak super.fay; - # Requests latest versions of crypton-connection and tls - darcs = super.darcs.overrideScope (self: super: { - crypton-connection = self.crypton-connection_0_4_1; - tls = self.tls_2_0_6; - }); - # Requests version 2 of tls, can be removed once it's the default diohsc = super.diohsc.overrideScope (self: super: { tls = self.tls_2_0_6; @@ -2150,16 +2123,13 @@ self: super: { # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; - cli-git = lib.pipe super.cli-git [ - doJailbreak - (addBuildTool pkgs.git) - ]; + cli-git = addBuildTool pkgs.git super.cli-git; # Need https://github.com/obsidiansystems/cli-nix/pull/5 and more cli-nix = addBuildTools [ pkgs.nix pkgs.nix-prefetch-git - ] (doJailbreak super.cli-nix); + ] super.cli-nix; nix-thunk = doJailbreak super.nix-thunk; @@ -2219,6 +2189,7 @@ self: super: { # 2021-04-16: too strict bounds on QuickCheck and tasty # https://github.com/hasufell/lzma-static/issues/1 lzma-static = doJailbreak super.lzma-static; + xz = doJailbreak super.xz; # Too strict version bounds on base: # https://github.com/obsidiansystems/database-id/issues/1 @@ -2263,16 +2234,6 @@ self: super: { ihaskell-display = doJailbreak super.ihaskell-display; ihaskell-basic = doJailbreak super.ihaskell-basic; - # Fixes too strict version bounds on regex libraries - # Presumably to be removed at the next release - # Test suite doesn't support hspec 2.8 - # https://github.com/yi-editor/yi/issues/1124 - yi-language = appendPatch (fetchpatch { - url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; - relative = "yi-language"; - sha256 = "sha256-AVQLvul3ufxGQyoXud05qauclNanf6kunip0oJ/9lWQ="; - }) (dontCheck super.yi-language); - # Tests need to lookup target triple x86_64-unknown-linux # https://github.com/llvm-hs/llvm-hs/issues/334 llvm-hs = dontCheckIf (pkgs.stdenv.targetPlatform.system != "x86_64-linux") super.llvm-hs; @@ -2313,8 +2274,8 @@ self: super: { }) super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - gi-gtk_4 = self.gi-gtk_4_0_9; - gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override { + gi-gtk_4 = self.gi-gtk_4_0_11; + gi-gtk_4_0_11 = doDistribute (super.gi-gtk_4_0_11.override { gi-gdk = self.gi-gdk_4; }); gi-gdk_4 = self.gi-gdk_4_0_9; @@ -2485,8 +2446,6 @@ self: super: { # Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1 memory-cd = dontCheck super.memory-cd; - # https://github.com/haskell/fgl/pull/99 - fgl = doJailbreak super.fgl; fgl-arbitrary = doJailbreak super.fgl-arbitrary; # raaz-0.3 onwards uses backpack and it does not play nicely with @@ -2559,9 +2518,6 @@ self: super: { # 2023-07-18: https://github.com/srid/ema/issues/156 ema = doJailbreak super.ema; - # 2024-03-02: base <=4.18.0.0 https://github.com/srid/url-slug/pull/2 - url-slug = doJailbreak super.url-slug; - glirc = super.glirc.override { vty = self.vty_6_2; vty-unix = super.vty-unix.override { @@ -2608,7 +2564,6 @@ self: super: { system-fileio = doJailbreak (dontCheck super.system-fileio); # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release - ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; hasura-ekg-core = doJailbreak super.hasura-ekg-core; # Test suite doesn't support hspec 2.8 @@ -2834,21 +2789,6 @@ self: super: { # base <4.14 decimal-literals = doJailbreak super.decimal-literals; - # 2024-06-22: hevm ghc96 fixes - hevm = lib.pipe super.hevm [ - (appendPatch (fetchpatch { - url = "https://github.com/ethereum/hevm/compare/02c072f...hellwolf:hevm:c29d3a7.patch"; - hash = "sha256-cL26HD77vXsiKqo5G6PXgK0q19MUGMwaNium5x93CBI="; - })) - (overrideCabal (old: { - postPatch = old.postPatch or "" + '' - sed -i 's/^ *brick .*,/brick,/' hevm.cabal - sed -i 's/^ *vty .*,/vty,/' hevm.cabal - ''; - })) - doJailbreak - ]; - # multiple bounds too strict snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; @@ -2857,7 +2797,6 @@ self: super: { heist-extra = doJailbreak super.heist-extra; # base <4.18.0.0.0 unionmount = doJailbreak super.unionmount; # base <4.18 - path-tree = doJailbreak super.path-tree; # base <4.18 https://github.com/srid/pathtree/pull/1 tailwind = doJailbreak super.tailwind; # base <=4.17.0.0 tagtree = doJailbreak super.tagtree; # base <=4.17 https://github.com/srid/tagtree/issues/1 commonmark-wikilink = doJailbreak super.commonmark-wikilink; # base <4.18.0.0.0 @@ -2934,18 +2873,6 @@ self: super: { html-charset = dontCheck super.html-charset; - # true-name-0.1.0.4 has been tagged, but has not been released to Hackage. - # Also, beyond 0.1.0.4 an additional patch is required to make true-name - # compatible with current versions of template-haskell - # https://github.com/liyang/true-name/pull/4 - true-name = appendPatch (fetchpatch { - url = "https://github.com/liyang/true-name/compare/0.1.0.3...nuttycom:true-name:update_template_haskell.patch"; - hash = "sha256-ZMBXGGc2X5AKXYbqgkLXkg5BhEwyj022E37sUEWahtc="; - }) (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.true-name); - # 2024-08-15: primitive >=0.9 && <0.10 posix-api = doJailbreak super.posix-api; @@ -3005,7 +2932,7 @@ self: super: { }) super.kmonad; ghc-syntax-highlighter_0_0_12_0 = super.ghc-syntax-highlighter_0_0_12_0.overrideScope(self: super: { - ghc-lib-parser = self.ghc-lib-parser_9_10_1_20240511; + ghc-lib-parser = self.ghc-lib-parser_9_10_1_20241103; }); # 2024-03-17: broken @@ -3037,36 +2964,6 @@ self: super: { }) super.linux-namespaces; - inherit - (let - unbreakRepa = packageName: drv: lib.pipe drv [ - # 2023-12-23: Apply build fixes for ghc >=9.4 - (appendPatches (lib.optionals (lib.versionAtLeast self.ghc.version "9.4") (repaPatches.${packageName} or []))) - # 2023-12-23: jailbreak for base <4.17, vector <0.13 - doJailbreak - ]; - # https://github.com/haskell-repa/repa/pull/27 - repaPatches = lib.mapAttrs (relative: hash: lib.singleton (pkgs.fetchpatch { - name = "repa-pr-27.patch"; - url = "https://github.com/haskell-repa/repa/pull/27/commits/40cb2866bb4da51a8cac5e3792984744a64b016e.patch"; - inherit relative hash; - })) { - repa = "sha256-bcSnzvCJmmSBts9UQHA2dYL0Q+wXN9Fbz5LfkrmhCo8="; - repa-io = "sha256-KsIN7NPWCyTpVzhR+xaBKGl8vC6rYH94llvlTawSxFk="; - repa-examples = "sha256-//2JG1CW1h2sKS2BSJadVAujSE3v1TfS0F8zgcNkPI8="; - repa-algorithms = "sha256-z/a7DpT3xJrIsif4cbciYcTSjapAtCoNNVX7PrZtc4I="; - }; - in - lib.mapAttrs unbreakRepa super) - repa - repa-io - repa-examples - repa-algorithms - # The following packages aren't fixed yet, sorry: - # repa-array, repa-convert, repa-eval, repa-flow, - # repa-query, repa-scalar, repa-store, repa-stream - ; - # Use recent git version as the hackage version is outdated and not building on recent GHC versions haskell-to-elm = overrideSrc { version = "unstable-2023-12-02"; @@ -3078,6 +2975,10 @@ self: super: { }; } super.haskell-to-elm; + # Overly strict upper bounds on esqueleto + # https://github.com/jonschoning/espial/issues/61 + espial = doJailbreak super.espial; + # https://github.com/dpwright/HaskellNet-SSL/pull/33 Use crypton-connection instead of connection HaskellNet-SSL = appendPatch (pkgs.fetchpatch { name = "HaskellNet-SSL-crypton-connection.patch"; @@ -3088,12 +2989,8 @@ self: super: { # https://github.com/isovector/type-errors/issues/9 type-errors = dontCheck super.type-errors; - # 2024-05-15: Hackage distribution is missing files needed for tests - # https://github.com/isovector/cornelis/issues/150 - cornelis = dontCheck super.cornelis; - lzma = doJailbreak (super.lzma.overrideScope (self: super: { - tasty = super.tasty_1_5; + tasty = super.tasty_1_5_2; })); # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 @@ -3115,9 +3012,6 @@ self: super: { # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5 zinza = dontCheck super.zinza; - # Doesn't officially support hedgehog > 1.3 yet: https://github.com/coot/free-algebras/pull/33 - free-algebras = doJailbreak super.free-algebras; - pdftotext = overrideCabal (drv: { postPatch = '' # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6 @@ -3164,4 +3058,31 @@ self: super: { ''; }) super.quickcheck-state-machine; + testcontainers = lib.pipe super.testcontainers [ + dontCheck # Tests require docker + doJailbreak # https://github.com/testcontainers/testcontainers-hs/pull/58 + ]; + + # https://bitbucket.org/echo_rm/hailgun/pull-requests/27 + hailgun = appendPatches [ + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/ac2bc2a3003e4b862625862c4565fece01c0cf57/raw"; + sha256 = "sha256-MWeK9nzMVP6cQs2GBFkohABgL8iWcT7YzwF+tLOkIjo="; + }) + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/583daaf87265a7fa67ce5171fe1077e61be9b39c/raw"; + sha256 = "sha256-6WITonLoONxZzzkS7EI79LwmwSdkt6TCgvHA2Hwy148="; + }) + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/b9680b82f6d58f807828c1bbb57e26c7af394501/raw"; + sha256 = "sha256-MnOc51tTNg8+HDu1VS2Ct7Mtu0vuuRd3DjzOAOF+t7Q="; + }) + ] super.hailgun; + + # opencascade-hs requires the include path configuring relative to the + # opencascade subdirectory in include. + opencascade-hs = appendConfigureFlags [ + "--extra-include-dirs=${lib.getDev pkgs.opencascade-occt}/include/opencascade" + ] super.opencascade-hs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 2658a1c190afe..e65e33a8cc116 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -332,6 +332,22 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + http-streams = super.http-streams.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + io-streams = super.io-streams.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + io-streams-haproxy = super.io-streams-haproxy.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + openssl-streams = super.openssl-streams.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + snap = super.snap.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); @@ -368,6 +384,10 @@ self: super: ({ ''; }) super.di-core; + # Require /usr/bin/security which breaks sandbox + http-reverse-proxy = dontCheck super.http-reverse-proxy; + servant-auth-server = dontCheck super.servant-auth-server; + } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # aarch64-darwin # Workarounds for justStaticExecutables on aarch64-darwin. Since dead code @@ -440,11 +460,6 @@ self: super: ({ } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 { # x86_64-darwin - # Work around store corruption on one of our Hydra builders - # https://github.com/NixOS/nixpkgs/issues/356741 - filepath-bytestring = triggerRebuild 1 super.filepath-bytestring; - magic = triggerRebuild 1 super.magic; - # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 regex-rure = dontCheck super.regex-rure; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 6341e1ea1043b..0846a6976b629 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -53,7 +53,7 @@ self: super: { unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; @@ -174,8 +174,8 @@ self: super: { # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; - # Requires GHC < 9.4 - ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); + # 0.4.6.0 only supports >= 9.0 + ghc-source-gen = doDistribute self.ghc-source-gen_0_4_5_0; # No instance for (Show B.Builder) arising from a use of ‘print’ http-types = dontCheck super.http-types; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 865df383f05f3..8d0f1fabb151f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -50,7 +50,7 @@ self: super: { unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; @@ -94,7 +94,7 @@ self: super: { ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = self.exceptions_0_10_8; + exceptions = self.exceptions_0_10_9; # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index e53dab2b4b845..eb11eaf2a992f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -52,7 +52,7 @@ self: super: { unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; @@ -151,9 +151,6 @@ self: super: { # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; - # Requires GHC < 9.4 - ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); - hspec-megaparsec = super.hspec-megaparsec_2_2_0; # No instance for (Show B.Builder) arising from a use of ‘print’ diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 6d0cd255ef9c2..ad9cbf204fed0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -62,29 +62,33 @@ self: super: { # already made the relevant changes. aeson = doDistribute self.aeson_2_2_3_0; attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; - auto-update = super.auto-update_0_2_1; + auto-update = doDistribute self.auto-update_0_2_6; + dependent-sum-template = doJailbreak self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 extensions = doDistribute self.extensions_0_1_0_2; fourmolu = doDistribute self.fourmolu_0_16_2_0; hashable = doDistribute self.hashable_1_4_7_0; integer-conversion = doDistribute self.integer-conversion_0_1_1; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + ghc-lib = doDistribute self.ghc-lib_9_10_1_20241103; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20241103; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = self.http2_5_3_4; + http2 = doDistribute self.http2_5_3_9; + http-semantics = doDistribute self.http-semantics_0_3_0; + htree = doDistribute self.htree_0_2_0_0; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; network-run = super.network-run_0_4_0; ormolu = doDistribute self.ormolu_0_7_7_0; - primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec - quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; + primitive = doDistribute self.primitive_0_9_0_0; + quickcheck-instances = doDistribute self.quickcheck-instances_0_3_32; rebase = doDistribute self.rebase_1_21_1; rerebase = doDistribute self.rerebase_1_21_1; scientific = doDistribute self.scientific_0_3_8_0; semirings = doDistribute self.semirings_0_7; - time-manager = super.time-manager_0_1_0; - th-abstraction = doDistribute self.th-abstraction_0_7_0_0; + time-manager = doDistribute self.time-manager_0_2_2; + th-abstraction = doDistribute self.th-abstraction_0_7_1_0; uuid-types = doDistribute self.uuid-types_1_0_6; - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_7; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -120,7 +124,7 @@ self: super: { # # Test suite issues # - call-stack = dontCheck super.call-stack; # expects the package to be named "main", but we generate a name + call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers ==0.6.* lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.* resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.* 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 da44762d969e4..582f46aa2425d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -2,9 +2,10 @@ let inherit (pkgs) lib; - in +with haskellLib; + self: super: { llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -56,4 +57,22 @@ self: super: { unix = null; 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; + primitive = doDistribute self.primitive_0_9_0_0; + splitmix = doDistribute self.splitmix_0_1_1; + tagged = doDistribute self.tagged_0_8_9; + tar = doDistribute self.tar_0_6_3_0; + + # Test suite issues + call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index d81d457418c52..e3e9109418c51 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -52,7 +52,7 @@ self: super: { unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; @@ -129,9 +129,6 @@ self: super: { # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = super.ghc-exactprint_1_5_0; - # Requires GHC < 9.4 - ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); - # Packages which need compat library for GHC < 9.6 inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super) indexed-traversable diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 18ba0d1af60c9..204ae814f02a5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -61,7 +61,7 @@ in unix = null; # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; # Jailbreaks & Version Updates diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 91b24ebf94293..b221bcf2e589f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -53,15 +53,16 @@ self: super: { # # Version upgrades # - th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022; + th-abstraction = doDistribute self.th-abstraction_0_7_1_0; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_4_20241130; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022; - megaparsec = doDistribute self.megaparsec_9_6_1; + ghc-lib = doDistribute self.ghc-lib_9_8_4_20241130; + megaparsec = doDistribute self.megaparsec_9_7_0; # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f aeson = doJailbreak (doDistribute self.aeson_2_2_3_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; + dependent-sum-template = self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; ormolu = self.ormolu_0_7_4_0; @@ -94,7 +95,6 @@ self: super: { # blaze-svg = doJailbreak super.blaze-svg; # base <4.19 commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19 - dependent-sum-template = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21 diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1 diagrams-postscript = doJailbreak super.diagrams-postscript; # base <4.19, bytestring <0.12 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 @@ -135,17 +135,6 @@ self: super: { # 2023-12-23: It needs this to build under ghc-9.6.3. # A factor of 100 is insufficent, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; - - # Loosen bounds - patch = appendPatch (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/91fed138483a7bf2b098d45b9e5cc36191776320.patch"; - sha256 = "sha256-/KLfIshia88lU5G/hA7ild7+a2mqc7qgSa9AEBqEqkQ="; - }) super.patch; - reflex = appendPatch (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/0ac53ca3eab2649dd3f3edc585e10af8d13b28cd.patch"; - sha256 = "sha256-umjwgdSKebJdRrXjwHhsi8HBqotx1vFibY9ttLkyT/0="; - }) super.reflex; - } // lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix index 4c532de28bf20..537c58a427c40 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix @@ -40,7 +40,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 stm = doJailbreak self.stm_2_5_3_1; - exceptions = dontCheck self.exceptions_0_10_8; + exceptions = dontCheck self.exceptions_0_10_9; ## OTHER PACKAGES diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d6efd52d2e1e4..ca6d668ce9f5e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -129,7 +129,6 @@ broken-packages: - alex-prelude # failure in job https://hydra.nixos.org/build/233238387 at 2023-09-02 - al # failure in job https://hydra.nixos.org/build/252733710 at 2024-03-16 - alfred # failure in job https://hydra.nixos.org/build/233227316 at 2023-09-02 - - alfred-margaret # failure in job https://hydra.nixos.org/build/233223038 at 2023-09-02 - alga # failure in job https://hydra.nixos.org/build/233252723 at 2023-09-02 - algebra-dag # failure in job https://hydra.nixos.org/build/233191945 at 2023-09-02 - algebraic-classes # failure in job https://hydra.nixos.org/build/233246872 at 2023-09-02 @@ -384,6 +383,7 @@ broken-packages: - bdelta # failure in job https://hydra.nixos.org/build/233214765 at 2023-09-02 - bdo # failure in job https://hydra.nixos.org/build/233216486 at 2023-09-02 - beamable # failure in job https://hydra.nixos.org/build/233211619 at 2023-09-02 + - beam-automigrate # failure in job https://hydra.nixos.org/build/282936134 at 2024-12-24 - beam # failure in job https://hydra.nixos.org/build/233213313 at 2023-09-02 - beam-mysql # failure in job https://hydra.nixos.org/build/233253237 at 2023-09-02 - beam-newtype-field # failure in job https://hydra.nixos.org/build/233206317 at 2023-09-02 @@ -745,6 +745,7 @@ broken-packages: - cg # failure in job https://hydra.nixos.org/build/233212272 at 2023-09-02 - cgi-utils # failure in job https://hydra.nixos.org/build/233251773 at 2023-09-02 - cgroup-rts-threads # failure in job https://hydra.nixos.org/build/233207888 at 2023-09-02 + - chakra # failure in job https://hydra.nixos.org/build/282936173 at 2024-12-24 - chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13 - chalmers-lava2000 # failure in job https://hydra.nixos.org/build/233239592 at 2023-09-02 - changelog-d # failure in job https://hydra.nixos.org/build/252716175 at 2024-03-16 @@ -1225,6 +1226,8 @@ broken-packages: - dead-code-detection # failure in job https://hydra.nixos.org/build/233205957 at 2023-09-02 - Deadpan-DDP # failure in job https://hydra.nixos.org/build/233221990 at 2023-09-02 - dead-simple-json # failure in job https://hydra.nixos.org/build/233204301 at 2023-09-02 + - debruijn # failure in job https://hydra.nixos.org/build/283207128 at 2024-12-31 + - debruijn-safe # failure in job https://hydra.nixos.org/build/283210219 at 2024-12-31 - debugger-hs # failure in job https://hydra.nixos.org/build/233206302 at 2023-09-02 - debug-me # failure in job https://hydra.nixos.org/build/233213991 at 2023-09-02 - debug-trace-file # failure in job https://hydra.nixos.org/build/233231840 at 2023-09-02 @@ -1236,6 +1239,7 @@ broken-packages: - deepcontrol # failure in job https://hydra.nixos.org/build/233238035 at 2023-09-02 - DeepDarkFantasy # failure in job https://hydra.nixos.org/build/233242150 at 2023-09-02 - deepl # failure in job https://hydra.nixos.org/build/233232956 at 2023-09-02 + - deep-map # failure in job https://hydra.nixos.org/build/283207785 at 2024-12-31 - deepseq-bounded # failure in job https://hydra.nixos.org/build/233211193 at 2023-09-02 - deepseq-instances # failure in job https://hydra.nixos.org/build/233236748 at 2023-09-02 - deepseq-magic # failure in job https://hydra.nixos.org/build/233228993 at 2023-09-02 @@ -1487,6 +1491,7 @@ broken-packages: - edit-lenses # failure in job https://hydra.nixos.org/build/233195827 at 2023-09-02 - editline # failure in job https://hydra.nixos.org/build/233259515 at 2023-09-02 - effectful-st # failure in job https://hydra.nixos.org/build/233248591 at 2023-09-02 + - effectful-zoo # failure in job https://hydra.nixos.org/build/283208805 at 2024-12-31 - effect-handlers # failure in job https://hydra.nixos.org/build/233234988 at 2023-09-02 - effective-aspects # failure in job https://hydra.nixos.org/build/233223120 at 2023-09-02 - effect-stack # failure in job https://hydra.nixos.org/build/233212358 at 2023-09-02 @@ -1522,6 +1527,7 @@ broken-packages: - elocrypt # failure in job https://hydra.nixos.org/build/233229627 at 2023-09-02 - ema-generics # failure in job https://hydra.nixos.org/build/233200038 at 2023-09-02 - emailaddress # failure in job https://hydra.nixos.org/build/233202700 at 2023-09-02 + - email # deprecated, depends on outdated dependencies - email-header # failure in job https://hydra.nixos.org/build/233243713 at 2023-09-02 - email-postmark # failure in job https://hydra.nixos.org/build/233245426 at 2023-09-02 - embed-config # failure in job https://hydra.nixos.org/build/233237733 at 2023-09-02 @@ -1533,7 +1539,6 @@ broken-packages: - enchant # failure in job https://hydra.nixos.org/build/233196992 at 2023-09-02 - Encode # failure in job https://hydra.nixos.org/build/252712962 at 2024-03-16 - encode-string # failure in job https://hydra.nixos.org/build/233251833 at 2023-09-02 - - encoding # failure in job https://hydra.nixos.org/build/233216476 at 2023-09-02 - encoding-io # failure in job https://hydra.nixos.org/build/233208714 at 2023-09-02 - encryptable # failure in job https://hydra.nixos.org/build/233215911 at 2023-09-02 - endo # failure in job https://hydra.nixos.org/build/233222561 at 2023-09-02 @@ -2058,6 +2063,7 @@ broken-packages: - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14 - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02 + - gi-nm # failure in job https://hydra.nixos.org/build/283561133 at 2024-12-31 - ginsu # failure in job https://hydra.nixos.org/build/233223259 at 2023-09-02 - gipeda # failure in job https://hydra.nixos.org/build/233228149 at 2023-09-02 - giphy-api # failure in job https://hydra.nixos.org/build/233203687 at 2023-09-02 @@ -2248,7 +2254,7 @@ broken-packages: - hahp # failure in job https://hydra.nixos.org/build/233250101 at 2023-09-02 - haiji # failure in job https://hydra.nixos.org/build/233232272 at 2023-09-02 - hail # failure in job https://hydra.nixos.org/build/233219127 at 2023-09-02 - - hailgun # failure in job https://hydra.nixos.org/build/233242996 at 2023-09-02 + - hailgun-send # failure in job https://hydra.nixos.org/build/282936164 at 2024-12-24 - hairy # failure in job https://hydra.nixos.org/build/233226903 at 2023-09-02 - hakaru # failure in job https://hydra.nixos.org/build/233231467 at 2023-09-02 - hakismet # failure in job https://hydra.nixos.org/build/233212497 at 2023-09-02 @@ -2808,6 +2814,7 @@ broken-packages: - hsc3-cairo # failure in job https://hydra.nixos.org/build/233215926 at 2023-09-02 - hsc3-db # failure in job https://hydra.nixos.org/build/233191679 at 2023-09-02 - hsc3-dot # failure in job https://hydra.nixos.org/build/233219452 at 2023-09-02 + - hsc3 # failure in job https://hydra.nixos.org/build/283199022 at 2024-12-31 - hsc3-lang # failure in job https://hydra.nixos.org/build/233198291 at 2023-09-02 - hsc3-process # failure in job https://hydra.nixos.org/build/233196358 at 2023-09-02 - hsc3-rec # failure in job https://hydra.nixos.org/build/233206364 at 2023-09-02 @@ -2842,6 +2849,7 @@ broken-packages: - hsfilt # failure in job https://hydra.nixos.org/build/233242295 at 2023-09-02 - hs-fltk # failure in job https://hydra.nixos.org/build/233225244 at 2023-09-02 - hsforce # failure in job https://hydra.nixos.org/build/233242016 at 2023-09-02 + - hsftp # failure in job https://hydra.nixos.org/build/283199528 at 2024-12-31 - hs-gizapp # failure in job https://hydra.nixos.org/build/233248733 at 2023-09-02 - hsgnutls # failure in job https://hydra.nixos.org/build/233199419 at 2023-09-02 - hsgnutls-yj # failure in job https://hydra.nixos.org/build/233220680 at 2023-09-02 @@ -3029,6 +3037,7 @@ broken-packages: - hx # failure in job https://hydra.nixos.org/build/233225223 at 2023-09-02 - hxmppc # failure in job https://hydra.nixos.org/build/233253810 at 2023-09-02 - HXQ # failure in job https://hydra.nixos.org/build/233218116 at 2023-09-02 + - hxthelper # failure in job https://hydra.nixos.org/build/282936106 at 2024-12-24 (> 10 years since last release) - hxt-pickle-utils # failure in job https://hydra.nixos.org/build/233212654 at 2023-09-02 - hyakko # failure in job https://hydra.nixos.org/build/233199297 at 2023-09-02 - hydra # failure in job https://hydra.nixos.org/build/233212477 at 2023-09-02 @@ -3464,6 +3473,7 @@ broken-packages: - lazy-priority-queue # failure in job https://hydra.nixos.org/build/233211457 at 2023-09-02 - lazyset # failure in job https://hydra.nixos.org/build/233248383 at 2023-09-02 - l-bfgs-b # failure in job https://hydra.nixos.org/build/233258769 at 2023-09-02 + - lbfgs # failure in job https://hydra.nixos.org/build/282178103 at 2024-12-23 - LC3 # failure in job https://hydra.nixos.org/build/233192513 at 2023-09-02 - lcs # failure in job https://hydra.nixos.org/build/233232193 at 2023-09-02 - ldif # failure in job https://hydra.nixos.org/build/233195577 at 2023-09-02 @@ -3518,14 +3528,17 @@ broken-packages: - libphonenumber # failure in job https://hydra.nixos.org/build/233251839 at 2023-09-02 - libpq # failure in job https://hydra.nixos.org/build/233192542 at 2023-09-02 - librandomorg # failure in job https://hydra.nixos.org/build/233232749 at 2023-09-02 + - libremidi # failure in job https://hydra.nixos.org/build/283561085 at 2024-12-31 - libsecp256k1 # failure in job https://hydra.nixos.org/build/234441559 at 2023-09-13 - libsodium # failure in job https://hydra.nixos.org/build/243816565 at 2024-01-01 - libsystemd-daemon # failure in job https://hydra.nixos.org/build/233207090 at 2023-09-02 - libtagc # failure in job https://hydra.nixos.org/build/233223631 at 2023-09-02 - libtelnet # failure in job https://hydra.nixos.org/build/233209594 at 2023-09-02 + - libtorch-ffi # failure in job https://hydra.nixos.org/build/283204506 at 2024-12-31 - libvirt-hs # failure in job https://hydra.nixos.org/build/253697570 at 2024-03-31 - libxls # failure in job https://hydra.nixos.org/build/233257847 at 2023-09-02 - libxlsxwriter-hs # failure in job https://hydra.nixos.org/build/233244798 at 2023-09-02 + - libxml-sax # failure in job https://hydra.nixos.org/build/283561084 at 2024-12-31 - libxslt # failure in job https://hydra.nixos.org/build/233248464 at 2023-09-02 - libyaml-streamly # failure in job https://hydra.nixos.org/build/233203611 at 2023-09-02 - libzfs # failure in job https://hydra.nixos.org/build/233662945 at 2023-09-02 @@ -4267,7 +4280,6 @@ broken-packages: - openapi3-code-generator # failure in job https://hydra.nixos.org/build/233255628 at 2023-09-02 - openapi-petstore # failure in job https://hydra.nixos.org/build/233221722 at 2023-09-02 - openapi-typed # failure in job https://hydra.nixos.org/build/233226830 at 2023-09-02 - - opencascade-hs # failure in job https://hydra.nixos.org/build/243821447 at 2024-01-01 - opencc # failure in job https://hydra.nixos.org/build/233211902 at 2023-09-02 - opench-meteo # failure in job https://hydra.nixos.org/build/233212476 at 2023-09-02 - OpenCL # failure in job https://hydra.nixos.org/build/233216571 at 2023-09-02 @@ -4525,6 +4537,7 @@ broken-packages: - pg-harness # failure in job https://hydra.nixos.org/build/233219805 at 2023-09-02 - pg-harness-server # failure in job https://hydra.nixos.org/build/233236493 at 2023-09-02 - pgp-wordlist # failure in job https://hydra.nixos.org/build/252723543 at 2024-03-16 + - pg-query # failure in job https://hydra.nixos.org/build/283202281 at 2024-12-31 - pg-recorder # failure in job https://hydra.nixos.org/build/233241248 at 2023-09-02 - pgsql-simple # failure in job https://hydra.nixos.org/build/233228421 at 2023-09-02 - pg-store # failure in job https://hydra.nixos.org/build/233208603 at 2023-09-02 @@ -4699,6 +4712,7 @@ broken-packages: - posix-acl # failure in job https://hydra.nixos.org/build/233222892 at 2023-09-02 - posix-filelock # failure in job https://hydra.nixos.org/build/252726822 at 2024-03-16 - posix-realtime # failure in job https://hydra.nixos.org/build/233191463 at 2023-09-02 + - posix-timer # failure in job https://hydra.nixos.org/build/282175703 at 2024-12-23 - posix-waitpid # failure in job https://hydra.nixos.org/build/233206551 at 2023-09-02 - posplyu # failure in job https://hydra.nixos.org/build/233230437 at 2023-09-02 - postcodes # failure in job https://hydra.nixos.org/build/233247290 at 2023-09-02 @@ -5092,12 +5106,12 @@ broken-packages: - reorderable # failure in job https://hydra.nixos.org/build/233256477 at 2023-09-02 - reorder-expression # failure in job https://hydra.nixos.org/build/233215573 at 2023-09-02 - repa-bytestring # failure in job https://hydra.nixos.org/build/252723812 at 2024-03-16 + - repa-convert # failure in job https://hydra.nixos.org/build/283561102 at 2024-12-31 - repa-devil # failure in job https://hydra.nixos.org/build/252724171 at 2024-03-16 - - repa-eval # failure in job https://hydra.nixos.org/build/233259486 at 2023-09-02 - repa-examples # failure in job https://hydra.nixos.org/build/252712195 at 2024-03-16 - repa-linear-algebra # failure in job https://hydra.nixos.org/build/252713634 at 2024-03-16 - - repa-scalar # failure in job https://hydra.nixos.org/build/233213694 at 2023-09-02 - repa-series # failure in job https://hydra.nixos.org/build/233200085 at 2023-09-02 + - repa-stream # failure in job https://hydra.nixos.org/build/283561119 at 2024-12-31 - ReplaceUmlaut # failure in job https://hydra.nixos.org/build/233228662 at 2023-09-02 - repl # failure in job https://hydra.nixos.org/build/233233135 at 2023-09-02 - RepLib # failure in job https://hydra.nixos.org/build/233210112 at 2023-09-02 @@ -5238,6 +5252,7 @@ broken-packages: - salvia-protocol # failure in job https://hydra.nixos.org/build/233220788 at 2023-09-02 - sandlib # failure in job https://hydra.nixos.org/build/233249740 at 2023-09-02 - sandman # failure in job https://hydra.nixos.org/build/233209667 at 2023-09-02 + - sandwich-contexts # failure in job https://hydra.nixos.org/build/282178661 at 2024-12-23 - sarasvati # failure in job https://hydra.nixos.org/build/233208235 at 2023-09-02 - satchmo-backends # failure in job https://hydra.nixos.org/build/233228506 at 2023-09-02 - satchmo # failure in job https://hydra.nixos.org/build/252712042 at 2024-03-16 @@ -5340,7 +5355,6 @@ broken-packages: - serokell-util # failure in job https://hydra.nixos.org/build/233209952 at 2023-09-02 - servant-aeson-specs # failure in job https://hydra.nixos.org/build/233202245 at 2023-09-02 - servant-auth-cookie # failure in job https://hydra.nixos.org/build/233235829 at 2023-09-02 - - servant-auth-server # failure in job https://hydra.nixos.org/build/233208742 at 2023-09-02 - servant-avro # failure in job https://hydra.nixos.org/build/233225632 at 2023-09-02 - servant-benchmark # failure in job https://hydra.nixos.org/build/233203748 at 2023-09-02 - servant-cassava # failure in job https://hydra.nixos.org/build/252730906 at 2024-03-16 @@ -5357,6 +5371,7 @@ broken-packages: - servant-generic # failure in job https://hydra.nixos.org/build/233211338 at 2023-09-02 - servant-github # failure in job https://hydra.nixos.org/build/233231566 at 2023-09-02 - servant-github-webhook # failure in job https://hydra.nixos.org/build/233234237 at 2023-09-02 + - servant-hateoas # failure in job https://hydra.nixos.org/build/282175434 at 2024-12-23 - servant-htmx # failure in job https://hydra.nixos.org/build/233214786 at 2023-09-02 - servant-http2-client # failure in job https://hydra.nixos.org/build/260189694 at 2024-05-19 - servant-http-streams # failure in job https://hydra.nixos.org/build/233242852 at 2023-09-02 @@ -5945,6 +5960,7 @@ broken-packages: - tak # failure in job https://hydra.nixos.org/build/233191188 at 2023-09-02 - Takusen # failure in job https://hydra.nixos.org/build/233230088 at 2023-09-02 - takusen-oracle # failure in job https://hydra.nixos.org/build/233197944 at 2023-09-02 + - talash # failure in job https://hydra.nixos.org/build/283561113 at 2024-12-31 - tamarin-prover-utils # failure in job https://hydra.nixos.org/build/233235417 at 2023-09-02 - Tape # failure in job https://hydra.nixos.org/build/233191662 at 2023-09-02 - tapioca # failure in job https://hydra.nixos.org/build/233207781 at 2023-09-02 @@ -5955,6 +5971,7 @@ broken-packages: - tasty-checklist # failure in job https://hydra.nixos.org/build/252710481 at 2024-03-16 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 - tasty-flaky # failure in job https://hydra.nixos.org/build/275140265 at 2024-10-21 + - tasty-golden-extra # failure in job https://hydra.nixos.org/build/283204600 at 2024-12-31 - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 - tasty-mgolden # failure in job https://hydra.nixos.org/build/233248196 at 2023-09-02 @@ -6015,7 +6032,6 @@ broken-packages: - terntup # failure in job https://hydra.nixos.org/build/233203746 at 2023-09-02 - tersmu # failure in job https://hydra.nixos.org/build/233253842 at 2023-09-02 - testCom # failure in job https://hydra.nixos.org/build/233210118 at 2023-09-02 - - testcontainers # failure in job https://hydra.nixos.org/build/233226596 at 2023-09-02 - TestExplode # failure in job https://hydra.nixos.org/build/233207327 at 2023-09-02 - test-fixture # failure in job https://hydra.nixos.org/build/233203103 at 2023-09-02 - test-framework-doctest # failure in job https://hydra.nixos.org/build/233256232 at 2023-09-02 @@ -6137,6 +6153,7 @@ broken-packages: - time-w3c # failure in job https://hydra.nixos.org/build/233225902 at 2023-09-02 - timezone-detect # failure in job https://hydra.nixos.org/build/233205213 at 2023-09-02 - tini # failure in job https://hydra.nixos.org/build/252732072 at 2024-03-16 + - tinyapp # failure in job https://hydra.nixos.org/build/283207451 at 2024-12-31 - tinyid # failure in job https://hydra.nixos.org/build/233249999 at 2023-09-02 - TinyLaunchbury # failure in job https://hydra.nixos.org/build/233233671 at 2023-09-02 - tinylog # failure in job https://hydra.nixos.org/build/233198434 at 2023-09-02 @@ -6235,7 +6252,6 @@ broken-packages: - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02 - tropical # failure in job https://hydra.nixos.org/build/233212835 at 2023-09-02 - tropical-geometry # failure in job https://hydra.nixos.org/build/234465815 at 2023-09-13 - - true-name # failure in job https://hydra.nixos.org/build/252712188 at 2024-03-16 - trust-chain # failure in job https://hydra.nixos.org/build/233252622 at 2023-09-02 - tsession # failure in job https://hydra.nixos.org/build/233259005 at 2023-09-02 - tslib # failure in job https://hydra.nixos.org/build/233225813 at 2023-09-02 @@ -6338,7 +6354,7 @@ broken-packages: - unamb-custom # failure in job https://hydra.nixos.org/build/233197458 at 2023-09-02 - unbeliever # failure in job https://hydra.nixos.org/build/233221256 at 2023-09-02 - unbounded-delays-units # failure in job https://hydra.nixos.org/build/233200989 at 2023-09-02 - - unbound-generics # failure in job https://hydra.nixos.org/build/252713870 at 2024-03-16 + - unbound-generics-unify # failure in job https://hydra.nixos.org/build/283205015 at 2024-12-31 - unboxed-containers # failure in job https://hydra.nixos.org/build/233200384 at 2023-09-02 - unboxed # failure in job https://hydra.nixos.org/build/233219555 at 2023-09-02 - unboxed-references # failure in job https://hydra.nixos.org/build/233192713 at 2023-09-02 @@ -6642,6 +6658,7 @@ broken-packages: - wkt-geom # failure in job https://hydra.nixos.org/build/233199774 at 2023-09-02 - wkt-types # failure in job https://hydra.nixos.org/build/269668682 at 2024-08-19 - WL500gPLib # failure in job https://hydra.nixos.org/build/233203811 at 2023-09-02 + - wled-json # failure in job https://hydra.nixos.org/build/283201821 at 2024-12-31 - wl-pprint-console # failure in job https://hydra.nixos.org/build/233204682 at 2023-09-02 - wl-pprint-extras # failure in job https://hydra.nixos.org/build/233233369 at 2023-09-02 - WMSigner # failure in job https://hydra.nixos.org/build/233199780 at 2023-09-02 @@ -6746,6 +6763,7 @@ broken-packages: - xsd # failure in job https://hydra.nixos.org/build/233209021 at 2023-09-02 - xsha1 # failure in job https://hydra.nixos.org/build/233257136 at 2023-09-02 - xslt # failure in job https://hydra.nixos.org/build/233225636 at 2023-09-02 + - xtea # failure in job https://hydra.nixos.org/build/282175333 at 2024-12-23 - xxhash # failure in job https://hydra.nixos.org/build/233240335 at 2023-09-02 - y0l0bot # failure in job https://hydra.nixos.org/build/233212722 at 2023-09-02 - yabi-muno # failure in job https://hydra.nixos.org/build/233246871 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 203c57c1fa65f..42e07f4fa4a8c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -38,6 +38,10 @@ default-package-overrides: - xmonad-contrib < 0.18.1 # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment - http-semantics < 0.3.0 + # 2024-12-23: last version to be compatible with Stackage LTS 22/23 (due to data-default) + - diagrams-input < 0.1.4 + # 2024-12-31: last version that's compatible with GHC < 9.9 + - htree < 0.2.0.0 extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -61,6 +65,9 @@ extra-packages: - ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8 + - ghc-lib == 9.10.* # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9 + - ghc-lib-parser == 9.10.* # 2024-12-26: preserve for ghc-syntax-highlighter == 0.0.12.0 + - ghc-lib-parser-ex == 9.10.* # 2024-12-26: preserve for 9.10 HLS - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8 - happy == 1.19.12 # for ghcjs @@ -110,6 +117,7 @@ extra-packages: - extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12 - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - typst-symbols >=0.1.6 && <0.1.7 # 2024-11-20: for pandoc 3.5 and quarto + - ghc-source-gen < 0.4.6.0 # 2024-12-31: support GHC < 9.0 package-maintainers: abbradar: @@ -201,6 +209,7 @@ package-maintainers: - patat - svgcairo danielrolls: + - aws-spend-summary - byte-count-reader - shellify - specup diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 5bde9a49a2378..51bcdc9495a3b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.39 +# Stackage LTS 22.43 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -30,7 +30,7 @@ default-package-overrides: - aeson-pretty ==0.8.10 - aeson-qq ==0.8.4 - aeson-schemas ==1.4.2.1 - - aeson-typescript ==0.6.3.0 + - aeson-typescript ==0.6.4.0 - aeson-unqualified-ast ==1.0.0.3 - aeson-value-parser ==0.19.7.2 - aeson-warning-parser ==0.1.1 @@ -38,7 +38,7 @@ default-package-overrides: - aeson-yaml ==1.1.0.1 - agda2lagda ==0.2023.6.9 - agreeing ==0.2.2.0 - - alarmclock ==0.7.0.6 + - alarmclock ==0.7.0.7 - alex ==3.4.0.1 - alex-meta ==0.3.0.13 - alex-tools ==0.6.1 @@ -428,7 +428,7 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backprop ==0.2.6.5 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.9 + - bank-holidays-england ==0.2.0.11 - barbies ==2.0.5.0 - barrier ==0.1.1 - base16 ==1.0 @@ -508,8 +508,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 - - bluefin ==0.0.9.0 - - bluefin-internal ==0.0.9.0 + - bluefin ==0.0.12.1 + - bluefin-internal ==0.0.13.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -579,8 +579,8 @@ default-package-overrides: - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.4 - - cabal-doctest ==1.0.10 + - cabal-debian ==5.2.5 + - cabal-doctest ==1.0.11 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 - cabal-rpm ==2.1.5 @@ -692,7 +692,7 @@ default-package-overrides: - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 - compact ==0.2.0.0 - - compactmap ==0.1.4.4 + - compactmap ==0.1.4.5 - companion ==0.1.0 - compdata ==0.13.1 - compensated ==0.8.3 @@ -745,7 +745,7 @@ default-package-overrides: - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.2 + - control-monad-omega ==0.3.3 - convertible ==1.1.1.1 - cookie ==0.4.6 - copilot ==3.19.1 @@ -772,8 +772,8 @@ default-package-overrides: - crackNum ==3.4 - crc32c ==0.1.0 - credential-store ==0.1.2 - - criterion ==1.6.3.0 - - criterion-measurement ==0.2.2.0 + - criterion ==1.6.4.0 + - criterion-measurement ==0.2.3.0 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 @@ -794,7 +794,7 @@ default-package-overrides: - crypton-x509 ==1.7.7 - crypton-x509-store ==1.6.9 - crypton-x509-system ==1.6.7 - - crypton-x509-validation ==1.6.12 + - crypton-x509-validation ==1.6.13 - crypto-pubkey-types ==0.4.3 - crypto-random-api ==0.2.0 - cryptostore ==0.3.1.0 @@ -854,7 +854,7 @@ default-package-overrides: - data-or ==1.0.0.7 - data-ordlist ==0.4.7.0 - data-ref ==0.1 - - data-reify ==0.6.3 + - data-reify ==0.6.4 - data-serializer ==0.3.5 - data-sketches ==0.3.1.0 - data-sketches-core ==0.1.0.0 @@ -883,7 +883,7 @@ default-package-overrides: - deriveJsonNoPrefix ==0.1.0.1 - derive-storable ==0.3.1.0 - derive-topdown ==0.0.3.0 - - deriving-aeson ==0.2.9 + - deriving-aeson ==0.2.10 - deriving-compat ==0.6.6 - deriving-trans ==0.9.1.0 - detour-via-sci ==1.0.0 @@ -987,7 +987,7 @@ default-package-overrides: - egison-pattern-src ==0.2.1.2 - either ==5.0.2 - either-unwrap ==1.1 - - ekg-core ==0.1.1.7 + - ekg-core ==0.1.1.8 - elerea ==2.9.0 - elf ==0.31 - eliminators ==0.9.3 @@ -1028,7 +1028,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.5 - - esqueleto ==3.5.11.2 + - esqueleto ==3.5.13.0 - event-list ==0.1.3 - every ==0.0.1 - evm-opcodes ==0.1.2 @@ -1105,13 +1105,13 @@ default-package-overrides: - fixed ==0.3 - fixed-length ==0.2.3.1 - fixed-vector ==1.2.3.0 - - fixed-vector-hetero ==0.6.1.1 + - fixed-vector-hetero ==0.6.2.0 - fix-whitespace ==0.1 - flac ==0.2.1 - flac-picture ==0.1.3 - flags-applicative ==0.1.0.3 - flat ==0.6 - - flatparse ==0.5.1.0 + - flatparse ==0.5.1.1 - flay ==0.4 - flexible-defaults ==0.0.3 - FloatingHex ==0.5 @@ -1124,7 +1124,7 @@ default-package-overrides: - focus ==1.0.3.2 - focuslist ==0.1.1.0 - foldable1-classes-compat ==0.1 - - fold-debounce ==0.2.0.12 + - fold-debounce ==0.2.0.14 - foldl ==1.4.17 - folds ==0.7.8 - FontyFruity ==0.5.3.5 @@ -1234,7 +1234,7 @@ default-package-overrides: - ghc-lib ==9.6.6.20240701 - ghc-lib-parser ==9.6.6.20240701 - ghc-lib-parser-ex ==9.6.0.2 - - ghc-parser ==0.2.6.0 + - ghc-parser ==0.2.7.0 - ghc-paths ==0.1.0.12 - ghc-syntax-highlighter ==0.0.10.0 - ghc-tcplugins-extra ==0.4.6 @@ -1260,7 +1260,7 @@ default-package-overrides: - gi-gobject ==2.0.31 - gi-graphene ==1.0.8 - gi-gtk ==3.0.43 - - gi-gtk-hs ==0.3.16 + - gi-gtk-hs ==0.3.17 - gi-gtksource ==3.0.29 - gi-harfbuzz ==0.0.10 - gi-javascriptcore ==4.0.28 @@ -1324,7 +1324,7 @@ default-package-overrides: - hackage-security ==0.6.2.4 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.2.2 + - hakyll ==4.16.3.0 - hakyllbars ==1.0.1.0 - hal ==1.0.1 - half ==0.3.1 @@ -1347,7 +1347,7 @@ default-package-overrides: - haskell-gi ==0.26.12 - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.1.1 + - haskell-lexer ==1.1.2 - HaskellNet ==0.6.1.2 - haskell-src ==1.0.4.1 - haskell-src-exts ==1.23.1 @@ -1406,7 +1406,7 @@ default-package-overrides: - hfsevents ==0.1.7 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.6.0 + - hi-file-parser ==0.1.7.0 - hindent ==6.1.1 - hinfo ==0.0.3.0 - hinotify ==0.4.1 @@ -1445,7 +1445,7 @@ default-package-overrides: - hostname-validate ==1.0.0 - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.10 + - hp2pretty ==0.10.1 - hpack ==0.36.1 - hpc-codecov ==0.5.0.0 - hpc-lcov ==1.1.2 @@ -1493,13 +1493,13 @@ default-package-overrides: - hsndfile-vector ==0.5.2 - HsOpenSSL ==0.11.7.8 - HsOpenSSL-x509-system ==0.1.0.4 - - hspec ==2.11.9 - - hspec-api ==2.11.9 + - hspec ==2.11.10 + - hspec-api ==2.11.10 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.2 - - hspec-core ==2.11.9 - - hspec-discover ==2.11.9 + - hspec-core ==2.11.10 + - hspec-discover ==2.11.10 - hspec-expectations ==0.8.4 - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 @@ -1510,7 +1510,7 @@ default-package-overrides: - hspec-junit-formatter ==1.1.2.1 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - - hspec-meta ==2.11.9 + - hspec-meta ==2.11.10 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 - hspec-tmp-proc ==0.5.2.0 @@ -1540,9 +1540,9 @@ default-package-overrides: - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.1.0 - - http-client-tls ==0.3.6.3 + - http-client-tls ==0.3.6.4 - http-common ==0.8.3.4 - - http-conduit ==2.3.9 + - http-conduit ==2.3.9.1 - http-date ==0.0.11 - http-directory ==0.1.10 - http-download ==0.2.1.0 @@ -1633,7 +1633,7 @@ default-package-overrides: - integer-conversion ==0.1.0.1 - integer-logarithms ==1.0.3.1 - integer-roots ==1.0.2.0 - - integer-types ==0.1.4.0 + - integer-types ==0.1.4.1 - integration ==0.2.1 - intern ==0.9.5 - interpolate ==0.2.1 @@ -1657,7 +1657,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.7.8 - ip6addr ==1.0.4 - - iproute ==1.7.14 + - iproute ==1.7.15 - IPv6Addr ==2.0.6 - ipynb ==0.2 - ipython-kernel ==0.11.0.0 @@ -1700,7 +1700,7 @@ default-package-overrides: - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.6 - - kansas-comet ==0.4.2 + - kansas-comet ==0.4.3 - katip ==0.8.8.2 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.4 @@ -1708,7 +1708,7 @@ default-package-overrides: - kdt ==0.2.6 - keep-alive ==0.2.1.0 - keter ==2.1.5 - - keycode ==0.2.2 + - keycode ==0.2.3 - keyed-vals ==0.2.3.1 - keyed-vals-hspec-tests ==0.2.3.1 - keyed-vals-mem ==0.2.3.1 @@ -1782,7 +1782,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.6 + - lifted-async ==0.10.2.7 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1822,7 +1822,7 @@ default-package-overrides: - logging-effect ==1.4.0 - logging-facade ==0.3.1 - logging-facade-syslog ==1 - - logict ==0.8.1.0 + - logict ==0.8.2.0 - logstash ==0.1.0.4 - loop ==0.3.0 - lpeg ==1.0.4 @@ -1921,7 +1921,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 - misfortune ==0.1.2.1 - - miso ==1.8.4.0 + - miso ==1.8.5.0 - missing-foreign ==0.1.1 - MissingH ==1.6.0.1 - mixed-types-num ==0.5.12 @@ -1961,7 +1961,7 @@ default-package-overrides: - monad-par-extras ==0.3.3 - monad-peel ==0.3 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.6 + - MonadRandom ==0.6.1 - monad-resumption ==0.1.4.0 - monad-schedule ==0.1.2.2 - monad-st ==0.2.4.1 @@ -2001,7 +2001,7 @@ default-package-overrides: - multiset ==0.3.4.3 - multistate ==0.8.0.4 - murmur3 ==1.0.5 - - murmur-hash ==0.1.0.10 + - murmur-hash ==0.1.0.11 - MusicBrainz ==0.4.1 - mustache ==2.4.2 - mutable-containers ==0.3.4.1 @@ -2010,14 +2010,14 @@ default-package-overrides: - mx-state-codes ==1.0.0.0 - myers-diff ==0.3.0.0 - mysql ==0.2.1 - - mysql-haskell ==1.1.5 + - mysql-haskell ==1.1.6 - mysql-haskell-nem ==0.1.0.0 - mysql-json-table ==0.1.4.0 - mysql-simple ==0.4.9 - n2o ==0.11.1 - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 - - named ==0.3.0.1 + - named ==0.3.0.2 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -2026,7 +2026,7 @@ default-package-overrides: - natural-arithmetic ==0.1.4.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - - natural-transformation ==0.4 + - natural-transformation ==0.4.1 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.5.1.4 - netcode-io ==0.0.3 @@ -2108,7 +2108,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.3.1 + - opaleye ==0.10.4.0 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2142,7 +2142,7 @@ default-package-overrides: - OrderedBits ==0.0.2.0 - ordered-containers ==0.2.4 - ormolu ==0.7.2.0 - - os-string ==2.0.6 + - os-string ==2.0.7 - overhang ==1.0.0 - packcheck ==0.6.0 - pager ==0.1.1.0 @@ -2174,7 +2174,7 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==1.3.0 - parser-combinators-tests ==1.3.0 - - parsers ==0.12.11 + - parsers ==0.12.12 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partialord ==0.0.2 @@ -2262,7 +2262,7 @@ default-package-overrides: - plaid ==0.1.0.4 - plotlyhs ==0.2.3 - Plural ==0.0.2 - - pointed ==5.0.4 + - pointed ==5.0.5 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.8 - poll ==0.0.0.2 @@ -2357,7 +2357,7 @@ default-package-overrides: - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 - purview ==0.2.0.2 - - pusher-http-haskell ==2.1.0.18 + - pusher-http-haskell ==2.1.0.19 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - PyF ==0.11.3.0 @@ -2526,7 +2526,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safe-gen ==1.0.1 - safeio ==0.0.6.0 - - safe-json ==1.2.0.1 + - safe-json ==1.2.0.2 - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - saltine ==0.2.1.0 @@ -2559,7 +2559,7 @@ default-package-overrides: - sdl2-image ==2.1.0.0 - sdl2-mixer ==1.2.0.0 - sdl2-ttf ==2.1.3 - - search-algorithms ==0.3.2 + - search-algorithms ==0.3.3 - secp256k1-haskell ==1.1.0 - securemem ==0.1.10 - selections ==0.3.0.0 @@ -2636,17 +2636,17 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.3 + - shellify ==0.11.0.4 - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - shell-utility ==0.1 - - shellwords ==0.1.3.1 + - shellwords ==0.1.3.2 - shelly ==1.12.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - - silently ==1.2.5.3 + - silently ==1.2.5.4 - simple ==2.0.0 - simple-affine-space ==0.2.1 - simple-cabal ==0.1.3.1 @@ -2734,7 +2734,7 @@ default-package-overrides: - statestack ==0.3.1.1 - StateVar ==1.2.2 - stateWriter ==0.4.0 - - static-bytes ==0.1.0 + - static-bytes ==0.1.1 - static-canvas ==0.2.0.3 - static-text ==0.2.0.7 - statistics ==0.16.2.1 @@ -2835,8 +2835,8 @@ default-package-overrides: - system-argv0 ==0.1.1 - systemd ==2.3.0 - systemd-socket-activation ==1.1.0.1 - - system-fileio ==0.3.16.4 - - system-filepath ==0.4.14 + - system-fileio ==0.3.16.5 + - system-filepath ==0.4.14.1 - system-info ==0.5.2 - system-linux-proc ==0.1.1.1 - tabular ==0.2.2.8 @@ -2915,7 +2915,7 @@ default-package-overrides: - text-ansi ==0.3.0.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7.2 - - text-builder-dev ==0.3.5 + - text-builder-dev ==0.3.6 - text-builder-linear ==0.1.3 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 @@ -2932,7 +2932,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.6 - text-show ==3.10.5 - - text-show-instances ==3.9.8 + - text-show-instances ==3.9.10 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2950,10 +2950,10 @@ default-package-overrides: - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.8 - th-lego ==0.3.0.3 - - th-lift ==0.8.4 + - th-lift ==0.8.5 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 - - th-orphans ==0.13.14 + - th-orphans ==0.13.15 - th-printf ==0.8 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 @@ -3098,7 +3098,7 @@ default-package-overrides: - universum ==1.8.2.2 - unix-bytestring ==0.4.0.2 - unix-compat ==0.7.3 - - unix-time ==0.4.15 + - unix-time ==0.4.16 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -3208,10 +3208,10 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.31 - - warp-tls ==3.4.7 + - warp-tls ==3.4.9 - wave ==0.2.1 - wcwidth ==0.0.2 - - webdriver ==0.12.0.0 + - webdriver ==0.12.0.1 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - webpage ==0.0.5.1 @@ -3219,14 +3219,14 @@ default-package-overrides: - websockets ==0.12.7.3 - websockets-simple ==0.2.0 - websockets-snap ==0.10.3.1 - - weigh ==0.0.17 + - weigh ==0.0.18 - welford-online-mean-variance ==0.2.0.0 - what4 ==1.5.1 - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.1.1 - - withdependencies ==0.3.0 + - witch ==1.2.3.1 + - withdependencies ==0.3.1 - witherable ==0.4.2 - within ==0.2.0.1 - with-location ==0.1.0 @@ -3266,7 +3266,7 @@ default-package-overrides: - xmlbf ==0.7 - xmlbf-xeno ==0.2.2 - xmlbf-xmlhtml ==0.2.2 - - xml-conduit ==1.9.1.3 + - xml-conduit ==1.9.1.4 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.2 - xml-helpers ==1.0.0 @@ -3294,7 +3294,7 @@ default-package-overrides: - yesod-core ==1.6.26.0 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - - yesod-form ==1.7.6 + - yesod-form ==1.7.9 - yesod-form-bootstrap4 ==3.0.1.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7d3699af9eb53..d1ffc758124c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -481,7 +481,6 @@ dont-distribute-packages: - amazon-emailer-client-snap - amby - ampersand - - amqp-streamly - analyze-client - anansi-hscolour - anatomy @@ -608,7 +607,7 @@ dont-distribute-packages: - bamstats - barley - base32-bytestring - - base_4_20_0_1 + - base_4_21_0_0 - baserock-schema - basic - batchd @@ -623,8 +622,6 @@ dont-distribute-packages: - bbi - bdcs - bdcs-api - - beam-automigrate - - beam-postgres - beam-th - beautifHOL - bech32-th @@ -795,14 +792,13 @@ dont-distribute-packages: - cflp - cfopu - chainweb-mining-client - - chakra - chalkboard-viewer - chapelure - charade - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_7_0_0 + - chart-svg_0_8_0_0 - chart-unit - chassis - chatty @@ -965,14 +961,14 @@ dont-distribute-packages: - copilot-cbmc - copilot-frp-sketch - copilot-language - - copilot-language_4_0 + - copilot-language_4_1 - copilot-libraries - - copilot-libraries_4_0 + - copilot-libraries_4_1 - copilot-sbv - copilot-theorem - - copilot-theorem_4_0 + - copilot-theorem_4_1 - copilot-verifier - - copilot_4_0 + - copilot_4_1 - corenlp-parser - coroutine-enumerator - coroutine-iteratee @@ -989,7 +985,7 @@ dont-distribute-packages: - cqrs-test - cqrs-testkit - crackNum - - crackNum_3_14 + - crackNum_3_15 - craft - craftwerk-cairo - craftwerk-gtk @@ -1163,7 +1159,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora - - dl-fedora_1_2 + - dl-fedora_1_2_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1230,7 +1226,6 @@ dont-distribute-packages: - elsa - ema-extra - emacs-keys - - email - emailparse - embroidery - emd @@ -1825,8 +1820,6 @@ dont-distribute-packages: - haddocset - hadoop-tools - haggis - - hailgun-send - - hailgun-simple - hails-bin - hake - hakyll-elm @@ -2119,6 +2112,7 @@ dont-distribute-packages: - hoppy-docs - hoppy-runtime - hoppy-std + - hotel-california - hotswap - hp2any-graph - hp2any-manager @@ -2149,6 +2143,10 @@ dont-distribute-packages: - hs-functors - hs-gen-iface - hs-ix + - hs-opentelemetry-awsxray + - hs-opentelemetry-instrumentation-tasty + - hs-opentelemetry-sdk + - hs-opentelemetry-utils-exceptions - hs-pkpass - hs-profunctors - hs-sdl-term-emulator @@ -2248,7 +2246,6 @@ dont-distribute-packages: - hxournal - hxt-binary - hxt-filter - - hxthelper - hxweb - hybrid - hydra-print @@ -2317,6 +2314,7 @@ dont-distribute-packages: - instrument-cloudwatch - integreat - intel-aes + - intel-powermon - interpolatedstring-qq - interpolatedstring-qq-mwotton - intro-prelude @@ -2694,6 +2692,7 @@ dont-distribute-packages: - mediabus-fdk-aac - mediabus-rtp - mediawiki2latex + - mello - mellon-gpio - mellon-web - memcache-conduit @@ -2917,6 +2916,8 @@ dont-distribute-packages: - nri-test-encoding - numeric-kinds - numeric-ode + - numeric-optimization + - numeric-optimization-ad - numerical - numhask-hedgehog - numhask-histogram @@ -2958,6 +2959,7 @@ dont-distribute-packages: - openpgp-crypto-api - openssh-github-keys - opentelemetry-lightstep + - opentelemetry-plugin - opentok - opentracing-http-client - opentracing-jaeger @@ -3029,7 +3031,7 @@ dont-distribute-packages: - perdure - perf - perf-analysis - - perf_0_13_0_0 + - perf_0_14_0_1 - perfecthash - periodic-client - periodic-client-exe @@ -3164,6 +3166,7 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs + - ppad-base58 - ppad-hmac-drbg - ppad-secp256k1 - pqueue-mtl @@ -3280,6 +3283,7 @@ dont-distribute-packages: - random-extras - random-hypergeometric - range-space + - ranged-list_0_1_2_3 - rasa - rasa-example-config - rasa-ext-bufs @@ -3358,7 +3362,6 @@ dont-distribute-packages: - regular-web - regular-xmlpickler - reheat - - rel8 - relational-postgresql8 - relational-query - relational-query-HDBC @@ -3372,10 +3375,8 @@ dont-distribute-packages: - remote-json-server - remotion - repa-array - - repa-convert - repa-flow - repa-plugin - - repa-stream - repa-v4l2 - replicant - repo-based-blog @@ -3484,6 +3485,7 @@ dont-distribute-packages: - samtools-conduit - samtools-enumerator - samtools-iteratee + - sandwich-webdriver_0_3_0_0 - sarsi - sasha - sasl @@ -3595,7 +3597,6 @@ dont-distribute-packages: - servant-zeppelin-server - servant-zeppelin-swagger - sessiontypes-distributed - - sgf - sgrep - shady-gen - shady-graphics @@ -3737,6 +3738,7 @@ dont-distribute-packages: - sr-extra - srt-dhall - srt-formatting + - srtree_2_0_0_2 - sscgi - sshd-lint - sssp @@ -3818,7 +3820,7 @@ dont-distribute-packages: - sydtest-webdriver-screenshot_0_1_0_0 - sydtest-webdriver-yesod - sydtest-yesod - - sydtest_0_18_0_0 + - sydtest_0_19_0_0 - sylvia - symantic-atom - symantic-http-demo @@ -3851,7 +3853,6 @@ dont-distribute-packages: - tak-ai - takahashi - tal - - talash - tamarin-prover - tamarin-prover-term - tamarin-prover-theory @@ -3875,6 +3876,7 @@ dont-distribute-packages: - techlab - telegram-bot - telegram-raw-api + - telescope - ten-lens - ten-unordered-containers - term-rewriting @@ -3999,6 +4001,7 @@ dont-distribute-packages: - type-sets - type-structure - type-sub-th + - typecheck-plugin-nat-simple_0_1_0_11 - typed-admin - typed-encoding-encoding - typed-gui @@ -4019,8 +4022,6 @@ dont-distribute-packages: - ukrainian-phonetics-basic - unagi-bloomfilter - unbound - - unbound-generics-unify - - unbound-kind-generics - unfoldable-restricted - uni-events - uni-graphs @@ -4032,6 +4033,7 @@ dont-distribute-packages: - unicoder - uniform-io - uniform-watch + - unimap - uniqueness-periods - uniqueness-periods-vector-examples - uniqueness-periods-vector-filters @@ -4143,8 +4145,6 @@ dont-distribute-packages: - warp-grpc - warp-quic - warped - - waterfall-cad - - waterfall-cad-examples - wavesurfer - wavy - weatherhs diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 82377d1ffe000..8b9e8e4fbe238 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -155,9 +155,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; }; @@ -464,6 +461,9 @@ self: super: builtins.intersectAttrs super { # Disable tests because they require a running dbus session xmonad-dbus = dontCheck super.xmonad-dbus; + # Test suite requires running a docker container via testcontainers + amqp-streamly = dontCheck super.amqp-streamly; + # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; }; @@ -471,6 +471,7 @@ self: super: builtins.intersectAttrs super { shellify = enableSeparateBinOutput super.shellify; specup = enableSeparateBinOutput super.specup; + aws-spend-summary = self.generateOptparseApplicativeCompletions [ "aws-spend-summary" ] (enableSeparateBinOutput super.aws-spend-summary); # Test suite wants to connect to $DISPLAY. bindings-GLFW = dontCheck super.bindings-GLFW; @@ -705,6 +706,7 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; + splitmix_0_1_1 = dontCheck super.splitmix_0_1_1; # Break infinite recursion cycle with OneTuple and quickcheck-instances. foldable1-classes-compat = dontCheck super.foldable1-classes-compat; @@ -822,6 +824,8 @@ self: super: builtins.intersectAttrs super { # Setup PATH for the actual tests ln -sf dist/build/git-annex/git-annex git-annex ln -sf git-annex git-annex-shell + ln -sf git-annex git-remote-annex + ln -sf git-annex git-remote-tor-annex PATH+=":$PWD" echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} @@ -979,6 +983,7 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; + primitive_0_9_0_0 = dontCheck super.primitive_0_9_0_0; cut-the-crap = let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg pkgs.youtube-dl ]; @@ -1009,6 +1014,18 @@ self: super: builtins.intersectAttrs super { postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; postgresql-pure = dontCheck super.postgresql-pure; + # Needs PostgreSQL db during tests + relocant = overrideCabal (drv: { + preCheck = '' + export postgresqlTestUserOptions="LOGIN SUPERUSER" + export PGDATABASE=relocant + ''; + testToolDepends = drv.testToolDepends or [] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) super.relocant; + retrie = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie; retrie_1_2_0_0 = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie_1_2_0_0; retrie_1_2_1_1 = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie_1_2_1_1; @@ -1326,6 +1343,14 @@ self: super: builtins.intersectAttrs super { ] ++ drv.testFlags or []; }) super.http-api-data-qq; + # Test have become more fussy in >= 2.0. We need to have which available for + # tests to succeed and the makefile no longer finds happy by itself. + happy_2_1_3 = overrideCabal (drv: { + buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.which ]; + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/happy:$PATH" + ''; + }) super.happy_2_1_3; # Additionally install documentation jacinda = overrideCabal (drv: { enableSeparateDocOutput = true; @@ -1389,16 +1414,6 @@ self: super: builtins.intersectAttrs super { ''; hydraPlatforms = pkgs.lib.platforms.all; broken = false; - patches = old.patches or [ ] ++ [ - (pkgs.fetchpatch { - # related: https://github.com/haskell/cabal/issues/10504 - name = "suppress-error-about-missing-local-index.patch"; - url = "https://github.com/haskell/cabal/commit/d58a75ef4adab36688878420cc9e2c25bca41ec4.patch"; - hash = "sha256-IZ+agNNN9AcIJBBsT30LAkAXCAoYKF+kIhccGPFdm+8="; - stripLen = 1; - includes = [ "src/Distribution/Client/IndexUtils.hs" ]; - }) - ]; }) super.cabal-install; tailwind = addBuildDepend @@ -1420,6 +1435,12 @@ self: super: builtins.intersectAttrs super { # Disable checks to break dependency loop with SCalendar scalendar = dontCheck super.scalendar; + # Make sure we build xz against nixpkgs' xz package instead of + # Hackage repackaging of the upstream sources. + xz = enableCabalFlag "system-xz" super.xz; + xz-clib = dontDistribute super.xz-clib; + lzma-static = dontDistribute super.lzma-static; # deprecated + halide-haskell = super.halide-haskell.override { Halide = pkgs.halide; }; feedback = self.generateOptparseApplicativeCompletions [ "feedback" ] @@ -1435,7 +1456,7 @@ self: super: builtins.intersectAttrs super { }) super) gi-javascriptcore gi-webkit2webextension - gi-gtk_4_0_9 + gi-gtk_4_0_11 gi-gdk_4_0_9 gi-gsk gi-adwaita diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5ad83946195ee..1248236717cea 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -822,6 +822,8 @@ self: { pname = "Agda"; version = "2.7.0.1"; sha256 = "13pn0mbxyfy04fcdl68l2m36b40hwk8iwpkqdfad3xsf9l5ddxil"; + revision = "2"; + editedCabalFile = "1v1nfzn3dxvdzrc7310jl29vf4yp40hhnkkbw6d9y8n14grn7lrp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1145,21 +1147,15 @@ self: { }) {}; "AspectAG" = callPackage - ({ mkDerivation, base, containers, ghc-prim, loch-th, mtl, poly-rec - , requirements, template-haskell - }: + ({ mkDerivation, base, mtl, poly-rec, requirements }: mkDerivation { pname = "AspectAG"; - version = "0.7.0.1"; - sha256 = "00cprqks3lany16zbmm250p1qms4hampwck44m688z2xk388gakn"; - revision = "2"; - editedCabalFile = "0hlgkm8ph28x1dkjprjjajdwk8y7ghsb9i6vr5jbr046vzrziblp"; - libraryHaskellDepends = [ - base containers ghc-prim loch-th mtl poly-rec requirements - template-haskell - ]; - description = "Strongly typed Attribute Grammars implemented using type-level programming"; - license = lib.licenses.gpl3Only; + version = "0.8.0.0"; + sha256 = "00aqqsdwy94kzbrfjvwqk7h7b39fnkzr5fvkbrda70jhgp2vnpnh"; + libraryHaskellDepends = [ base mtl poly-rec requirements ]; + testHaskellDepends = [ base poly-rec requirements ]; + description = "First-class Attribute Grammars implemented using type-level programming"; + license = lib.licenses.gpl2Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2927,15 +2923,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_14_0_0" = callPackage + "Cabal_3_14_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, time , transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.14.0.0"; - sha256 = "0pfvw4r4xdnis34k4pz987283g2r5gv3akxnfp7s3jgxffd7nm94"; + version = "3.14.1.0"; + sha256 = "1858158n9dbh5hcpcv2ikl3q01kmlap6n5fsp76mzihir5903ii3"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -3043,15 +3039,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_14_0_0" = callPackage + "Cabal-syntax_3_14_1_0" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers }: mkDerivation { pname = "Cabal-syntax"; - version = "3.14.0.0"; - sha256 = "0c9gwm9za13zvrwbq2lgzfcw6r42r2pwc424qk3vjnv4kazrni5x"; + version = "3.14.1.0"; + sha256 = "13d4sfqlbx2m8f075jnqq965sj0ayn1vk2fd2m8rdp9fsqy8hxm0"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers @@ -3225,8 +3221,8 @@ self: { pname = "Chart"; version = "1.9.5"; sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; - revision = "1"; - editedCabalFile = "0gi758fccq3674sxzs5qcdlyjivh78lzin5k4cb15d3gscjakkhk"; + revision = "2"; + editedCabalFile = "1a9z8an5yhsqbawzahmg77g9l6jvavhxbk2v48k4j8fyr7sy544q"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3243,8 +3239,8 @@ self: { pname = "Chart-cairo"; version = "1.9.4.1"; sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7"; - revision = "1"; - editedCabalFile = "193liy309yb9dnlfzfrc2kis0g8mj6ni1pqfr4kpn860r1m5gr5b"; + revision = "2"; + editedCabalFile = "0gyhv409q1a9rxw0j51rngws2bzy7xnjsbs4lj2wysjxp8c7xs74"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -3263,8 +3259,8 @@ self: { pname = "Chart-diagrams"; version = "1.9.5.1"; sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q"; - revision = "1"; - editedCabalFile = "0s2c4qrmy21y7cmsq24g67fw1q5vsspda8bz2ybp6117crnzw817"; + revision = "2"; + editedCabalFile = "14z8s46qxcn33mzy66zhlg0pmwk1xks8c3mmrrbj4bp30wldgihz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -3303,6 +3299,8 @@ self: { pname = "Chart-gtk"; version = "1.9.3"; sha256 = "0wdv193wsadzrkpxl6lzw2r11bvr4fnfhmzqcmpqns3psqpgk43f"; + revision = "1"; + editedCabalFile = "1a9gqgbhgr3qqmp953idl8p14apnxmr2m7znf4pfvbms6gih5fbb"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -3319,6 +3317,8 @@ self: { pname = "Chart-gtk3"; version = "1.9.3"; sha256 = "0lldchq419fivczas2sbbz45b1xlf2chd7a2af66mbigdbld3xka"; + revision = "1"; + editedCabalFile = "0l6yp4k3nnppnd6ryhykfm30hlk3j2raswrc3lc996mpkbb1rja0"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk3 mtl old-locale time @@ -3356,6 +3356,8 @@ self: { pname = "Chart-tests"; version = "1.9.4"; sha256 = "1sy31dl4mwm25ajpgr0pgkr85py5raf7h76bnz06ybygjbnmc4fp"; + revision = "1"; + editedCabalFile = "0dpq35wrswxinzscapwn399xfpf6ndb0xxb5aj56snzv5b8kd90m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -3419,6 +3421,24 @@ self: { broken = true; }) {}; + "ChibiHash" = callPackage + ({ mkDerivation, base, bytestring, hspec }: + mkDerivation { + pname = "ChibiHash"; + version = "0.2.0.0"; + sha256 = "023ddj6sywlnjrr17g5kgzjwgr5fp9rs613slc7rxx5rjsaddjwz"; + revision = "1"; + editedCabalFile = "0pvfjhqv3x2x9nc2hh9byp91rla8rskjhvms794sd6sfgx64a0jn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring hspec ]; + description = "a simple and fast 64-bit hash function"; + license = lib.licenses.mit; + mainProgram = "ChibiHash-example"; + }) {}; + "Chitra" = callPackage ({ mkDerivation, base, binary, bytestring, mtl, network }: mkDerivation { @@ -3542,6 +3562,23 @@ self: { broken = true; }) {}; + "ClickHaskell" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, network, text + , time, vector, wide-word + }: + mkDerivation { + pname = "ClickHaskell"; + version = "0.1.0"; + sha256 = "1yb3g1rh587clzhlav00c0m7v3fy4i09jf55i2mlwcv3w2xk1hd7"; + revision = "1"; + editedCabalFile = "1d8msl3vlazp7xsbd5glxjc1qppfi8q7x6ncqdd6mmi88q8rfgrz"; + libraryHaskellDepends = [ + base binary bytestring deepseq network text time vector wide-word + ]; + description = "ClickHouse driver"; + license = lib.licenses.bsd3; + }) {}; + "Clipboard" = callPackage ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { @@ -4867,16 +4904,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "Diff_0_5" = callPackage + "Diff_1_0_2" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "Diff"; - version = "0.5"; - sha256 = "0la5npl3zglzbsnlbksp0s6khb79cm6hbdxhy29sd3xivzg89k03"; - revision = "1"; - editedCabalFile = "1fxg0ibi80dq68draxfh1p0n4mkmyn7gm0b51jwpkq6rx8p9g2lw"; + version = "1.0.2"; + sha256 = "11ad6ng3pqjb9dixnqk35bpgzjzva7ifnnjjlz0z5xzbsp9jcznd"; libraryHaskellDepends = [ array base pretty ]; testHaskellDepends = [ array base directory pretty process QuickCheck test-framework @@ -8432,21 +8467,24 @@ self: { }) {}; "HCL" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck, random + ({ mkDerivation, base, containers, exceptions, HUnit, mtl + , QuickCheck, random }: mkDerivation { pname = "HCL"; - version = "1.8"; - sha256 = "1h5mrrpr6kma8k0mqzzjcyg3nd94f7lv6a2k5pfxcqs01qy3khgk"; + version = "1.9"; + sha256 = "0rl4i1p7k6ibjsqmzbdv44k9r01n6p4r8y47zjrv7pl1nm2f2csh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base containers mtl QuickCheck random ]; + libraryHaskellDepends = [ + base containers exceptions mtl QuickCheck random + ]; executableHaskellDepends = [ base containers mtl QuickCheck random ]; testHaskellDepends = [ - base containers HUnit mtl QuickCheck random + base containers exceptions HUnit mtl QuickCheck random ]; description = "High-level library for building command line interfaces"; license = lib.licenses.bsd3; @@ -9987,15 +10025,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "HSvm_1_0_3_32" = callPackage + "HSvm_1_0_3_35" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "HSvm"; - version = "1.0.3.32"; - sha256 = "1azbvnq13js2k3mvkmhdp9pjibkshyjigsc9krl9v26gkicmz47y"; + version = "1.0.3.35"; + sha256 = "0zs1l9022hc7j7mh5q2xa09ax33cx1llhgwfsf0s85494v732v0v"; libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; - license = lib.licenses.bsd2; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -10417,8 +10455,26 @@ self: { pname = "HaXml"; version = "1.25.13"; sha256 = "0wxkp9bnbnjrjrzsmpm6nknzn0ijiiajd5kms81kgyfypm4m91ax"; - revision = "2"; - editedCabalFile = "1y1qf3224gls6f27pp8w9cpyisdr24pan8ccfh1zffy9m2bk80lj"; + revision = "3"; + editedCabalFile = "069v5wapa004h37l16lfv81a7f1877apv8gvklax31z5b5i72hcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers filepath polyparse pretty random + ]; + executableHaskellDepends = [ base directory polyparse pretty ]; + description = "Utilities for manipulating XML documents"; + license = lib.licenses.lgpl21Only; + }) {}; + + "HaXml_1_25_14" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , polyparse, pretty, random + }: + mkDerivation { + pname = "HaXml"; + version = "1.25.14"; + sha256 = "1zvrpa88pydak4yx984zk7j5z84hqfyv682j6chk8j4kva6xhxza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10427,6 +10483,7 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {}; "Hach" = callPackage @@ -11993,6 +12050,26 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) imlib2;}; + "ImpSpec" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hspec, hspec-core + , hspec-expectations-lifted, HUnit, mtl, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, quickcheck-transformer + , random, text, unliftio + }: + mkDerivation { + pname = "ImpSpec"; + version = "0.1.0.0"; + sha256 = "1f0l8hlkf1d37m2xy8fsvizs7c9vr8y0kcqlwp0741fhwdnqzciq"; + libraryHaskellDepends = [ + base bytestring deepseq hspec hspec-core hspec-expectations-lifted + HUnit mtl prettyprinter prettyprinter-ansi-terminal QuickCheck + quickcheck-transformer random text unliftio + ]; + testHaskellDepends = [ base ]; + description = "Imperative approach to testing stateful applications. ImpSpec is build on top of HSpec and QuickCheck"; + license = lib.licenses.asl20; + }) {}; + "ImperativeHaskell" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -12936,6 +13013,8 @@ self: { pname = "LC3"; version = "0.1.0.2"; sha256 = "029l4rgdzas0w9c4dpgfxhgbl1ngkvsfd3yf6mx8vwriwgmqbs05"; + revision = "1"; + editedCabalFile = "0zb59py1ysw9kwa6n07n7c9fvpbk2xjvaq3h06dzjs7wxs8yj0p4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12996,6 +13075,8 @@ self: { pname = "LPFP"; version = "1.1.4"; sha256 = "1g86ajibry5ssz3nqnqvnd0w6psyr9gl6wsp6ijaa6r6y1izw1fa"; + revision = "1"; + editedCabalFile = "10k4c0dpjxsnh0c27i1slqhlkn3s81x6xbz54qjm97kkw75fs1zn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13017,6 +13098,8 @@ self: { pname = "LPFP-core"; version = "1.1.1"; sha256 = "030n95g1hq2ikawbwifgqzjfdg2y6hyl8vpvybg7ha36hb6vafn1"; + revision = "1"; + editedCabalFile = "1zxnd65apf1ris333d1dkp9aw62qmf9if1vh2invnnhjzl7aq2hz"; libraryHaskellDepends = [ base containers ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; @@ -14351,8 +14434,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "MicroCabal"; - version = "0.2.1.1"; - sha256 = "0yln9inja3m624qqpslws8jxk4x27v0yy7pc7p7915c15lxnpy68"; + version = "0.3.1.2"; + sha256 = "175f6s0b6h3vdi57jdwwx6mbi8azm3j5cnbqi1il3356hhfq0786"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory process ]; @@ -14362,18 +14445,19 @@ self: { }) {}; "MicroHs" = callPackage - ({ mkDerivation, base, deepseq, directory, ghc-prim, haskeline - , process, text, time + ({ mkDerivation, base, deepseq, directory, filepath, ghc-prim + , haskeline, process, text, time }: mkDerivation { pname = "MicroHs"; - version = "0.10.3.0"; - sha256 = "11zhgmkzkxxjhnf0jnzk50hsm60zxil5mqa6m1yq6wmg2h1g0vkf"; + version = "0.10.7.0"; + sha256 = "0s1px67b1ssw1scdh6ffx46iivsk628k9s3rrv70fbgpms31mjvf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base deepseq directory ghc-prim haskeline process text time + base deepseq directory filepath ghc-prim haskeline process text + time ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; @@ -14662,23 +14746,6 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, primitive, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.6"; - sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "4"; - editedCabalFile = "0hz8l2yx9p5qwis7lxsnk7n3zss00hw3rxphhj6ih56ppjv7d6h3"; - libraryHaskellDepends = [ - base mtl primitive random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = lib.licenses.bsd3; - }) {}; - - "MonadRandom_0_6_1" = callPackage ({ mkDerivation, base, mtl, primitive, random, transformers , transformers-compat }: @@ -14691,7 +14758,6 @@ self: { ]; description = "Random-number generation monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "MonadRandomLazy" = callPackage @@ -14935,6 +15001,23 @@ self: { mainProgram = "mucheck-smallcheck"; }) {}; + "MultiChor" = callPackage + ({ mkDerivation, base, bytestring, http-client, mtl, servant + , servant-client, servant-server, template-haskell + , unordered-containers, warp + }: + mkDerivation { + pname = "MultiChor"; + version = "1.0.1.1"; + sha256 = "1rdwjr6j398m91f7a6mjhpp9zjzs2iclq22q221pcxx5x1y08hq1"; + libraryHaskellDepends = [ + base bytestring http-client mtl servant servant-client + servant-server template-haskell unordered-containers warp + ]; + description = "Type-safe and efficient choreographies with location-set polymorphism"; + license = lib.licenses.bsd3; + }) {}; + "MultipletCombiner" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -15278,8 +15361,8 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; - revision = "1"; - editedCabalFile = "0kdr24dw1z1vj0a63bqsdz55ps4lksf4c5fw7l19bn51f71lpqrf"; + revision = "2"; + editedCabalFile = "0yb2bkc0mdywmn1px7i4fpfa6n37fj1fgdzsl3bmcbw9w26qikxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16075,6 +16158,8 @@ self: { pname = "OneTuple"; version = "0.4.2"; sha256 = "0mdbga3a5pjzszlq9bny3zgfbz25w2q2bjw2h6q1fk80yjhahk8p"; + revision = "1"; + editedCabalFile = "1m54gsnc1bqy30vv3fab7axxmfns23cass11cvjp0afshgwncwnx"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base hashable template-haskell ]; description = "Singleton Tuple"; @@ -16525,8 +16610,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; - revision = "2"; - editedCabalFile = "1cxv515z5ni102jwgadzsnaphimldrjz1klg33dbha87yblj2pgv"; + revision = "3"; + editedCabalFile = "0nfb930h870l21611zq894lbr2rzwzkc49b9kjgsvr7j0ag4nmxr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -16901,8 +16986,8 @@ self: { ({ mkDerivation, base, containers, diagrams-lib, hspec }: mkDerivation { pname = "PenroseKiteDart"; - version = "1.1.0"; - sha256 = "0m1wigw2n2cp1cgbj615xrzqq81yaaprdrfnpd7qilnzijrp0biq"; + version = "1.2"; + sha256 = "09z9kyyqmmbhw89inikh8hr2v8ninkwn4wkb7mjnfja92d4nfj3a"; libraryHaskellDepends = [ base containers diagrams-lib ]; testHaskellDepends = [ base containers diagrams-lib hspec ]; benchmarkHaskellDepends = [ base containers diagrams-lib ]; @@ -17651,8 +17736,8 @@ self: { ({ mkDerivation, base, mmorph, QuickCheck, random, transformers }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.2.2.1"; - sha256 = "16kn7l98h7px3644gjc24a8pgisy1gr3w5k4gzw71dp6msqcbnqh"; + version = "0.2.2.2"; + sha256 = "1sss452xjxhllvsaxm2ln932xcdnj4z1095yapv9yap4cbcjwaqf"; libraryHaskellDepends = [ base mmorph QuickCheck random transformers ]; @@ -18051,19 +18136,19 @@ self: { }) {}; "Raincat" = callPackage - ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl - , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time + ({ mkDerivation, base, containers, GLUT, mtl, OpenGL, random, sdl2 + , sdl2-image, sdl2-mixer, time }: mkDerivation { pname = "Raincat"; - version = "1.2.1"; - sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c"; + version = "1.2.3"; + sha256 = "1w20342faksdvqh2zw7kp1317vmy3khzxzjnzxcl4gknf2j9fls7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base containers extensible-exceptions GLUT mtl OpenGL random sdl2 - sdl2-image sdl2-mixer time + base containers GLUT mtl OpenGL random sdl2 sdl2-image sdl2-mixer + time ]; description = "A puzzle game written in Haskell with a cat in lead role"; license = lib.licenses.bsd3; @@ -19073,8 +19158,8 @@ self: { pname = "SVGFonts"; version = "1.8.0.1"; sha256 = "0r3z7i7x56qvhyc51jlq084c1biy9xn72nm19mw116gx49rm32k9"; - revision = "1"; - editedCabalFile = "0w4bcmfja0spjwfiysa6xzvr6k1f2b8qp5r57b9138zrcllzkrap"; + revision = "2"; + editedCabalFile = "1kk7hbsd0aard9457y674rw5yvailfap1jzmvmvzmfi4ripwqxag"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal @@ -19483,6 +19568,8 @@ self: { pname = "ShellCheck"; version = "0.10.0"; sha256 = "08bdjcdl457xz2vh8y2w29bcwh1k7sfzyvszln3498vm5m1xn22d"; + revision = "1"; + editedCabalFile = "1935jrzy1r3g9cc74b330fmxnz2i1j8hsdk9jnl557qgk6xjqzs7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20357,15 +20444,15 @@ self: { }) {}; "Spintax" = callPackage - ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: + ({ mkDerivation, attoparsec, base, either, extra, mtl, mwc-random + , text + }: mkDerivation { pname = "Spintax"; - version = "0.3.6.1"; - sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; - revision = "1"; - editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; + version = "0.3.7.0"; + sha256 = "1w2rfq9ayylifqgj5a0d9ivf9jvk43k4y23djpmwi02qlb96qr75"; libraryHaskellDepends = [ - attoparsec base extra mtl mwc-random text + attoparsec base either extra mtl mwc-random text ]; description = "Random text generation based on spintax"; license = lib.licenses.bsd3; @@ -22666,19 +22753,20 @@ self: { "WidgetRattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-boot, hashtables - , simple-affine-space, template-haskell, text, transformers + , monomer, simple-affine-space, template-haskell, text + , transformers }: mkDerivation { pname = "WidgetRattus"; - version = "0.2"; - sha256 = "0i54i5krl10ivmv9rm3aqi02zkqcwjid71iwdm2pjld6z2ls2z4y"; + version = "0.3"; + sha256 = "144fkaxw2v00ynsp9s52r6dpfagfmngh9mrc77ynl2vvyf99zlm7"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-boot hashtables simple-affine-space - template-haskell transformers + base containers ghc ghc-boot hashtables monomer simple-affine-space + template-haskell text transformers ]; testHaskellDepends = [ base containers text ]; - description = "An asynchronous modal FRP language"; + description = "An asynchronous modal FRP language for GUI programming"; license = lib.licenses.bsd3; }) {}; @@ -22699,8 +22787,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.14.0.0"; - sha256 = "1rb65bhma4dhs6gprr3k195fysx56k89s3v5cdhj2wghb3dwv7ag"; + version = "2.14.1.0"; + sha256 = "00sqx9vpkp56nblks3fq7v4bn6lig3cp4w504wjfz03dgwhh7xwy"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -23427,6 +23515,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "Yampa_0_14_12" = callPackage + ({ mkDerivation, base, criterion, deepseq, filepath, random + , simple-affine-space, time + }: + mkDerivation { + pname = "Yampa"; + version = "0.14.12"; + sha256 = "032kzcrxpsdb53xg7qrjl1h8vfd8alfknd8s03zsn8gg85grdnl3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq random simple-affine-space + ]; + benchmarkHaskellDepends = [ base criterion filepath time ]; + description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Yampa-core" = callPackage ({ mkDerivation, base, deepseq, random, vector-space }: mkDerivation { @@ -25464,8 +25571,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "acquire"; - version = "0.3.5"; - sha256 = "1xxr94rnywg7mnf6fq9gbvakglnr1qbyjgvclrsrifjmzmdpbr9p"; + version = "0.3.6"; + sha256 = "1k704606ykjkgiapgaxp058rnaanr5fv977l4hj49b5ck4ghd9hh"; libraryHaskellDepends = [ base mtl transformers ]; description = "Abstraction over management of resources"; license = lib.licenses.mit; @@ -26778,6 +26885,18 @@ self: { broken = true; }) {}; + "aeson-jsonpath" = callPackage + ({ mkDerivation, aeson, base, hspec, parsec, protolude, vector }: + mkDerivation { + pname = "aeson-jsonpath"; + version = "0.1.0.0"; + sha256 = "0s7i5zsjzvsq1xj2xaf208fmhp34lzxavz5y38sygwj910wn6pl8"; + libraryHaskellDepends = [ aeson base parsec protolude vector ]; + testHaskellDepends = [ aeson hspec parsec protolude ]; + description = "Parse and run JSONPath queries on Aeson documents"; + license = lib.licenses.mit; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -27215,8 +27334,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.6.3.0"; - sha256 = "1bmhjl10adms07l2fg7qpjr3qsqdbwdfmj5psh6vi5s13w0sjxz9"; + version = "0.6.4.0"; + sha256 = "0xhh2xdg1axpwaigq1g200a516j3w7g5lrk0adin2nsafidc66zx"; libraryHaskellDepends = [ aeson base bytestring containers mtl string-interpolate template-haskell text th-abstraction transformers @@ -27461,8 +27580,8 @@ self: { }: mkDerivation { pname = "aftovolio"; - version = "0.4.0.0"; - sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; + version = "0.6.2.0"; + sha256 = "0ijyhd38g7dfd64dksc5v834qd1k2wmz2r37fsz612xdgkldfqcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27807,8 +27926,8 @@ self: { }: mkDerivation { pname = "aip-version"; - version = "0.0.0.2"; - sha256 = "0gcdbvcikiqg86nvcf6b8b897fq9mciilc9p0sfnfphabqlb1q55"; + version = "0.0.0.3"; + sha256 = "0vdzyi4ns4z84s0i6j2psw9r9x6kvhgnv13pql3xcdxzdmjsl20c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28216,19 +28335,20 @@ self: { }) {inherit (pkgs) openal;}; "alarmclock" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays + ({ mkDerivation, async, base, clock, hspec, hspec-discover, stm + , time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.7.0.6"; - sha256 = "02fkmdhhzdmjkz68l9gayk99b21kvm47ksaflqlqsw3yiy8zq2ss"; + version = "0.7.0.7"; + sha256 = "18f4y7g7iv7mvwbjgn6vf668qc9n0sig4q0qlh5l34bkvmzkp3pz"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; testHaskellDepends = [ async base clock hspec stm time unbounded-delays ]; + testToolDepends = [ hspec-discover ]; description = "Wake up and perform an action at a certain time"; license = lib.licenses.bsd3; }) {}; @@ -28359,8 +28479,8 @@ self: { pname = "alex-tools"; version = "0.6.1"; sha256 = "1nh8qbsv4sn6gxc7j8cbp2pb85cajilzhp8rchlwnk7bv8lzf8ji"; - revision = "2"; - editedCabalFile = "1ykm6ycxahwjkjdadcifay94c4mmp9lp3mgrca1150cvv0ff30f8"; + revision = "3"; + editedCabalFile = "020l3qsm10jag2lblcfr7anissn2gi2p9nagwcs8am56siv14n0h"; libraryHaskellDepends = [ base bytestring deepseq template-haskell text ]; @@ -28411,9 +28531,7 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text vector ]; description = "Fast Aho-Corasick string searching"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dump-automaton"; - broken = true; }) {}; "alg" = callPackage @@ -28861,6 +28979,8 @@ self: { pname = "align-audio"; version = "0.0.0.1"; sha256 = "1r1660igj6bmzhccw30vj0wsz7jjkd5k0vbr4nrcbpcwkxllshnb"; + revision = "1"; + editedCabalFile = "1cqxzanhz71lgivffxddq95ay0vaxfpjl3b0zpzbcw3filfkqihy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36509,7 +36629,6 @@ self: { ]; description = "A simple streamly wrapper for amqp"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "amqp-utils" = callPackage @@ -36534,6 +36653,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "amqp-utils_0_6_6_0" = callPackage + ({ mkDerivation, amqp, base, bytestring, containers + , crypton-connection, crypton-x509-system, data-default-class + , directory, filepath, filepath-bytestring, hinotify, magic + , network, process, rawfilepath, text, time, tls, unix, utf8-string + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.6.6.0"; + sha256 = "08s3djzf4jpz765myxa2jl4sng61892xalczsgka2rnpgvxgcap0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring containers crypton-connection + crypton-x509-system data-default-class directory filepath + filepath-bytestring hinotify magic network process rawfilepath text + time tls unix utf8-string + ]; + description = "AMQP toolset for the command line"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, exceptions , monad-loops, mtl, resource-pool, text @@ -36746,6 +36888,8 @@ self: { pname = "android-activity"; version = "0.1"; sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6"; + revision = "1"; + editedCabalFile = "0ix06grk7kbr0pxa9i8f1amma7vmyrkwz3r5xi8b82j7p0b30mac"; libraryHaskellDepends = [ base data-default ]; description = "Turn regular Haskell programs into Android Activities"; license = lib.licenses.bsd3; @@ -36984,8 +37128,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, vector }: mkDerivation { pname = "anitomata"; - version = "0.1.0.2"; - sha256 = "01c1cjczb2mvgl93iqf3zg9sm9rz307bi8f96nk113r036db6nh9"; + version = "0.1.0.3"; + sha256 = "04v0iwvs1q1c2bnflw8jqvnz9myhjh7sygkcx98dvjjiv9zxfhbh"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; testToolDepends = [ hspec-discover ]; @@ -37000,8 +37144,8 @@ self: { }: mkDerivation { pname = "anitomata-aseprite"; - version = "0.1.1.2"; - sha256 = "177gqb3p64h8ymw5i20fd0xba1hqcw4j4prqnp6hs1h6wgrcmppq"; + version = "0.1.1.3"; + sha256 = "0zbqvhj3rlzma19mw6mwdwwqknribm7srn390zvzf5gfzcp5gi70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37229,12 +37373,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ansi-terminal_1_1_1" = callPackage + "ansi-terminal_1_1_2" = callPackage ({ mkDerivation, ansi-terminal-types, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "1.1.1"; - sha256 = "0k5wl5b9bzvkgplg4rgsz92rkps18s1qy5p560ypzad5z36qyi3y"; + version = "1.1.2"; + sha256 = "1c2n051943gkwc87vpw7nrjxr5hivzq128x9k5j2mqji0hz4ml58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal-types base colour ]; @@ -37889,8 +38033,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.4.1.2"; - sha256 = "0fjq8aifwcs9vm8l1vz5i7vfq3ca1g8w1ffp0f6w7cgdq0i9c16y"; + version = "0.5.0.0"; + sha256 = "121z6ikqcpyfb3caja40vdcc6g903akxbg7ybs1si95g8yqi5h0i"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; @@ -39045,8 +39189,8 @@ self: { pname = "apply-merge"; version = "0.1.1.0"; sha256 = "1snm9m35r3px9vgn64ygcqq37ay6jvwc5jsi3s62rxrh8biy8ir8"; - revision = "2"; - editedCabalFile = "1k5iajw80v2i40zmks4h8f9pfy8nq5zx55dwxgvn5z1k44wxa5z6"; + revision = "3"; + editedCabalFile = "1mcjvd77l4iz1yq02j4kqaicrimayb3ldxas8f96b7sisr1zyl14"; libraryHaskellDepends = [ base containers pqueue reflection ]; testHaskellDepends = [ base containers data-ordlist pqueue reflection tasty @@ -39236,6 +39380,8 @@ self: { pname = "apportionment"; version = "0.0.0.4"; sha256 = "12b4jlh3k3da1w5lw8z83qgvn0ys85xwvdqylm5kwfi2i1i72256"; + revision = "1"; + editedCabalFile = "051cznvkni4gl0715q9mxi07p39xq3vzlnzmaazrxvh74nnzlcqf"; libraryHaskellDepends = [ base containers utility-ht ]; testHaskellDepends = [ base doctest-exitcode-stdio doctest-lib QuickCheck @@ -39996,20 +40142,21 @@ self: { "argon" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , containers, directory, docopt, filepath, ghc, ghc-paths - , ghc-syb-utils, hlint, hspec, lens-simple, pipes, pipes-bytestring - , pipes-files, pipes-group, pipes-safe, QuickCheck, syb + , containers, directory, dirstream, docopt, filepath, ghc, ghc-boot + , ghc-paths, ghc-syb-utils, hlint, hspec, lens-simple, pipes + , pipes-bytestring, pipes-group, pipes-safe, QuickCheck, syb + , system-filepath }: mkDerivation { pname = "argon"; - version = "0.4.1.0"; - sha256 = "1sjv8zablab38wl9xir2hkkk997as7ryb57dqnyr6i4a26p50g6r"; + version = "0.4.2.0"; + sha256 = "1cx0j4396m0bczzk0zzn5i2wjmny43da8s2bhr7a3ghj8kg0dhw7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal containers directory ghc - ghc-paths ghc-syb-utils lens-simple pipes pipes-bytestring - pipes-files pipes-group pipes-safe syb + aeson ansi-terminal base bytestring Cabal containers directory + dirstream filepath ghc ghc-boot ghc-paths ghc-syb-utils lens-simple + pipes pipes-bytestring pipes-group pipes-safe syb system-filepath ]; executableHaskellDepends = [ base docopt pipes pipes-safe ]; testHaskellDepends = [ @@ -40136,8 +40283,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.2.1.0"; - sha256 = "188nbv404zly4p0klj2aad8lkfzgma473gzj4f7sxynkl11dp8f1"; + version = "0.2.2.0"; + sha256 = "0rrxsyb7s9smx3k6hjj5cjysjdzcgpvfypys5d8gwy5jj15liism"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -40389,8 +40536,8 @@ self: { pname = "array"; version = "0.5.8.0"; sha256 = "0sz6cm7p8n7kh8xyn0lpl7g6g744r57v9c2d827ng3b0mkb2s0is"; - revision = "1"; - editedCabalFile = "0j8lbxf3wliz3cal5zp9bh0ifisn0kncadg98fnlav5ls8rmby8n"; + revision = "2"; + editedCabalFile = "16y3q0gdd8qdj59vn1srnsqwqmfdk6nwnjs0z352iq8xh14zpg6c"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -40525,6 +40672,8 @@ self: { pname = "arrayfire"; version = "0.7.0.0"; sha256 = "0id1safpvd6lmjddgnkw94i6c586ba71yid4xfjq06wjx52l33rk"; + revision = "1"; + editedCabalFile = "0p5kzc32y18lwpnab7dg7bzppklw27mqzs21am4rr9dn5ghdwfdx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -40605,8 +40754,8 @@ self: { }: mkDerivation { pname = "arrow-utils"; - version = "0.1.1"; - sha256 = "112g74g844lnqfphkxqmp8ysnvi11iii9gcn70ml1ag6m5bdr7lc"; + version = "0.1.2"; + sha256 = "138bzcir259k1kql4h9shh5snfh7x7j3j7cwnbj9c70jywdnm1xd"; libraryHaskellDepends = [ base vector-sized ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -41553,6 +41702,8 @@ self: { pname = "assoc"; version = "1.1.1"; sha256 = "1xhg7fqs8i067q2wmpma1yynsa9vbrhjh4pmbbcmv7zhzsvlj493"; + revision = "1"; + editedCabalFile = "0pqq27nzpsabvklgbldqls37mcl2hzs19qy6balsqk7b3x6rpcqa"; libraryHaskellDepends = [ base ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -41784,8 +41935,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; - revision = "2"; - editedCabalFile = "0ddz3q3b478ahz8q0b3ni2b3ikw1sjc2p89j1p530670m3xnm7ng"; + revision = "3"; + editedCabalFile = "0fvnk4rz1d2j4n5pww17qy0km0blv2gqycnbjlyrg6kjcmhqqr5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -42261,6 +42412,27 @@ self: { license = lib.licenses.asl20; }) {}; + "atomic-counter_0_1_2_3" = callPackage + ({ mkDerivation, async, base, primitive, QuickCheck, stm, tasty + , tasty-bench, tasty-quickcheck + }: + mkDerivation { + pname = "atomic-counter"; + version = "0.1.2.3"; + sha256 = "016gyi2nzgr0lyd3g99snjjh49i2hgs8kbrjprn4439w3cwn6jyf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async base primitive QuickCheck stm tasty tasty-bench + tasty-quickcheck + ]; + description = "Mutable counters that can be modified with atomic operatinos"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "atomic-file-ops" = callPackage ({ mkDerivation, base, directory, filelock, filepath , io-string-like @@ -42719,8 +42891,8 @@ self: { pname = "attoparsec"; version = "0.14.4"; sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; - revision = "5"; - editedCabalFile = "1bmih9b4b3vdad8mpwy6k15ay2k8zbxl0z5x40b47ml1p0wraw7c"; + revision = "6"; + editedCabalFile = "1wrm23wl373219znwbcgpdpyw6a9ahwwhbvx387h07vln459s4im"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -43437,15 +43609,15 @@ self: { license = lib.licenses.mit; }) {}; - "auto-update_0_2_1" = callPackage + "auto-update_0_2_6" = callPackage ({ mkDerivation, base, exceptions, hspec, hspec-discover, HUnit - , retry + , retry, stm }: mkDerivation { pname = "auto-update"; - version = "0.2.1"; - sha256 = "19rpplsvakhw91iszddjsk2bfhj5w26715yz0ld71xpcnwdi8ym5"; - libraryHaskellDepends = [ base ]; + version = "0.2.6"; + sha256 = "0m0f9v3cbacgs1fmbh82r2bqbs7ya76zz0g9zy0hk8p2kmfcq9cs"; + libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base exceptions hspec HUnit retry ]; testToolDepends = [ hspec-discover ]; description = "Efficiently run periodic, on-demand actions"; @@ -43515,8 +43687,8 @@ self: { }: mkDerivation { pname = "autodocodec-nix"; - version = "0.0.1.4"; - sha256 = "1awfc6gvmqs5gz0vb6gihs3f8csrqhk1b8yni21np72y2j29pzfw"; + version = "0.0.1.5"; + sha256 = "0lfp0li2hjqad4pw27cyhzsy17frg0i1a6v6irihl362ymk8dj22"; libraryHaskellDepends = [ aeson autodocodec base containers scientific text unordered-containers vector @@ -43736,18 +43908,24 @@ self: { }: mkDerivation { pname = "automaton"; - version = "1.4"; - sha256 = "0g04as057ya3r698q8kwc73lzj2pzqwns7pd6dy84qs7rsxyj1fj"; + version = "1.5"; + sha256 = "0zm67nrk15yzw4r8p8ak2birly425xg0vfbzbdjznhpz0zsl09qz"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mmorph MonadRandom mtl profunctors selective semialign simple-affine-space these transformers ]; + executableHaskellDepends = [ + base mmorph MonadRandom mtl profunctors selective semialign + simple-affine-space these transformers + ]; testHaskellDepends = [ base mmorph MonadRandom mtl profunctors QuickCheck selective semialign simple-affine-space tasty tasty-hunit tasty-quickcheck these transformers ]; - description = "Effectful streams and automata in initial encoding"; + description = "Effectful streams and automata in coalgebraic encoding"; license = lib.licenses.mit; }) {}; @@ -44321,7 +44499,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aws_0_24_2" = callPackage + "aws_0_24_3" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , base16-bytestring, base64-bytestring, blaze-builder, byteable , bytestring, case-insensitive, cereal, conduit, conduit-extra @@ -44335,8 +44513,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.24.2"; - sha256 = "0bk8pc6zs514dg7bm97y6969rzndf3mvbdrdgbv2vwn70k1n1r66"; + version = "0.24.3"; + sha256 = "1vmgzpkkkmhsczxdnqiyq0havgf7269dk0xjc10gfw6f9dfxzqjz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45095,6 +45273,32 @@ self: { license = lib.licenses.mit; }) {}; + "aws-spend-summary" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3 + , ansi-terminal, base, bytestring, cassava, conduit, containers + , data-default, http-types, lens, optparse-applicative, text, time + , timelens, vector, zlib + }: + mkDerivation { + pname = "aws-spend-summary"; + version = "0.2.0.0"; + sha256 = "0hsyk496wn96qwsf9p8ari45gdg31p2aazql15kjjgzjlnb83yl0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 ansi-terminal base bytestring + cassava conduit containers data-default http-types lens text time + timelens vector zlib + ]; + executableHaskellDepends = [ + base data-default optparse-applicative text + ]; + description = "Extract recent daily AWS costs"; + license = lib.licenses.gpl2Only; + mainProgram = "aws-spend-summary"; + maintainers = [ lib.maintainers.danielrolls ]; + }) {}; + "aws-transcribe-ws" = callPackage ({ mkDerivation, aeson, am-test, async, base, base16-bytestring , binary, bytestring, crc, cryptohash-sha256, lens, stm, text, time @@ -45175,6 +45379,31 @@ self: { license = lib.licenses.mit; }) {}; + "awsspendsummary" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3 + , ansi-terminal, base, bytestring, cassava, conduit, containers + , data-default, http-types, lens, optparse-applicative, text, time + , timelens, vector, zlib + }: + mkDerivation { + pname = "awsspendsummary"; + version = "0.1.0.1"; + sha256 = "19qxmah2s11nn303p896f0b7bf8n26myh5wpv0frbapzgslp1jvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 ansi-terminal base bytestring + cassava conduit containers data-default http-types lens text time + timelens vector zlib + ]; + executableHaskellDepends = [ + base data-default optparse-applicative text + ]; + description = "Extract recent daily AWS costs"; + license = lib.licenses.gpl2Only; + mainProgram = "awsspendsummary"; + }) {}; + "axel" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , directory, extra, filepath, freer-simple, ghcid, hashable @@ -45996,8 +46225,8 @@ self: { pname = "bank-holiday-germany"; version = "1.3.0.0"; sha256 = "1agf4flql5xkj2rpdbdxpmvajhigcwzbxsmrh76bckmcj2b38k9f"; - revision = "3"; - editedCabalFile = "1v89p0d8q41ivmjciw0aw5w79y1kbyn23ma0s8673liwqxlzldig"; + revision = "4"; + editedCabalFile = "057nvj7bd6hm4xjylr75gq3sg74iz8h4xkyzxmxj54x76nplgq9i"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog time @@ -46019,13 +46248,16 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, time + }: mkDerivation { pname = "bank-holidays-england"; - version = "0.2.0.9"; - sha256 = "1iyyp76mfdiniszim6mi5ls5a2d3nm0fkrkz9v1y0r2gx1d1y3zx"; + version = "0.2.0.11"; + sha256 = "1ffilswdvh7khklyqxqbf7rxf9wzf1ly4dc8j5wli3a0w2bnjd19"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Calculation of bank holidays in England and Wales"; license = lib.licenses.bsd3; }) {}; @@ -46273,12 +46505,12 @@ self: { broken = true; }) {}; - "base_4_20_0_1" = callPackage + "base_4_21_0_0" = callPackage ({ mkDerivation, ghc-internal, ghc-prim }: mkDerivation { pname = "base"; - version = "4.20.0.1"; - sha256 = "0pg93zvlvx56ffz8b2gf920an4jzqyd1305h59c7slx51ibf2aww"; + version = "4.21.0.0"; + sha256 = "18jlid0yzsgxlg7mhdpfsr5jc8lvqrnvwkx1vmd8vl947nwzd9sj"; libraryHaskellDepends = [ ghc-internal ghc-prim ]; description = "Core data structures and operations"; license = lib.licenses.bsd3; @@ -46296,12 +46528,12 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat_0_14_0" = callPackage + "base-compat_0_14_1" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; - version = "0.14.0"; - sha256 = "0l4wg4xna7dnphlzslbxvi4h2rm35pw0sdn9ivhynf6899kdwipi"; + version = "0.14.1"; + sha256 = "1s9mk80lb8rscb0rndm9pkh1nmkkd4dnl7nymb3qypk43ra5brkl"; libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; @@ -46323,14 +46555,14 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat-batteries_0_14_0" = callPackage + "base-compat-batteries_0_14_1" = callPackage ({ mkDerivation, base, base-compat, ghc-prim, hspec, hspec-discover , QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.14.0"; - sha256 = "1qxbv7ywdr79bbi7py97k2ph1x6i9flw7kk6hmqrk00nzpqsbs1s"; + version = "0.14.1"; + sha256 = "1q9873jrfld2gqkw8xfhcmw1r3hqkvi58r1lxpvwh0nd0hpz8arx"; libraryHaskellDepends = [ base base-compat ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -46439,6 +46671,21 @@ self: { license = lib.licenses.mit; }) {}; + "base-orphans_0_9_3" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.9.3"; + sha256 = "1n5bpwzgw8xg00p23prajw0bj08kxh2ri3821ib1943ir1wm18qp"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46677,6 +46924,8 @@ self: { pname = "base62"; version = "0.1.1.2"; sha256 = "0kwz0asfc6lg96g14d58a64rvp2194z67y53nbb6y10hrbwq1j7j"; + revision = "1"; + editedCabalFile = "0lxkyd5a1diy2v3f910rw27wibziyy559275p4ra7kby9zky1m11"; libraryHaskellDepends = [ base bytebuild byteslice bytestring natural-arithmetic primitive text text-short wide-word @@ -46798,8 +47047,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "20"; - editedCabalFile = "0zp0c7n6gnxg37azc63xxrqchdzk2srf0zykccvndr3xlw1v83kc"; + revision = "21"; + editedCabalFile = "1y3j1lkqlqw8l4p0g8s3iac0gd84nz3pqccrzfj7n23fp19zr1q3"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -47353,8 +47602,8 @@ self: { pname = "battleship-combinatorics"; version = "0.0.1"; sha256 = "0pr1vcq69ndkln5jd6kxd0gn8jvc8n7aiqanxsrqnjpx4kkixph4"; - revision = "1"; - editedCabalFile = "0fw9dyylyvhsbzyslbm0r5k3l3sxbxmh0rq3cy8hkw204gm9x844"; + revision = "2"; + editedCabalFile = "0z2zqmdv5icamkfhpjnjnf88r21151k3pcqij6x0885m8s1y840p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47761,6 +48010,7 @@ self: { description = "DB migration library for beam, targeting Postgres"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "beam-core" = callPackage @@ -47772,6 +48022,29 @@ self: { pname = "beam-core"; version = "0.10.3.0"; sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; + revision = "1"; + editedCabalFile = "1spy3lxqbsmykmkqgzj79hhz455q9ilwpbwxyxlwxiklk0izvfg7"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri scientific tagged text time vector + vector-sized + ]; + testHaskellDepends = [ + base bytestring microlens tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = lib.licenses.mit; + }) {}; + + "beam-core_0_10_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.10.3.1"; + sha256 = "0n3fyjhcljd44ri7z3kb1sd3izv047v82m9n7597r7sbipv8cysc"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47782,6 +48055,7 @@ self: { ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "beam-migrate" = callPackage @@ -47794,6 +48068,8 @@ self: { pname = "beam-migrate"; version = "0.5.3.1"; sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; + revision = "1"; + editedCabalFile = "0sm683b4k7km2378gqkvii1lb7bx79pscll72jnwfzh72dxqc2fh"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47852,6 +48128,8 @@ self: { pname = "beam-postgres"; version = "0.5.4.1"; sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; + revision = "1"; + editedCabalFile = "0khizazf6ckfg641c0163hzy7wkvv2y9b8ma98m2wi0sng9j981i"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47865,7 +48143,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "beam-sqlite" = callPackage @@ -47879,8 +48156,8 @@ self: { pname = "beam-sqlite"; version = "0.5.3.0"; sha256 = "050nqjx6916j9c499i5zskankpg3bbh9f4m8lrnmf0mj4hsl96m4"; - revision = "1"; - editedCabalFile = "17n59xf66hmsiwlv3f4ybwa8wnkgawl2m93pylmaw6hg939d5518"; + revision = "2"; + editedCabalFile = "0ls88df3ls7xlc9w6kd7vfaichpbs2rmigd372j5sh7iqa6n0p9a"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable monad-control mtl network-uri scientific sqlite-simple @@ -47948,8 +48225,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.11"; - sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; + version = "0.14.12"; + sha256 = "1md63c0v8mn0ljcwfsx1bbsrq8a06hh5zz6n730x97db8gpf73vk"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -48169,6 +48446,8 @@ self: { pname = "bench"; version = "1.0.13"; sha256 = "0v2sfblzwjb0y8dnjpl9jxsiz14lqdnpa1vccbnm2y73b5pkj30p"; + revision = "1"; + editedCabalFile = "1nhnsbyy597nd2hv22hhbhblihvshymsqarlsv00x0q7ws9yblfn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48252,6 +48531,22 @@ self: { mainProgram = "example"; }) {}; + "benchpress_0_2_2_25" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.25"; + sha256 = "10h5jgj87z4aca0k39qg5frvd3syffj4g1f3sd2yl6yc9s33yr3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring time ]; + description = "Micro-benchmarking with detailed statistics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "example"; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec , parsec, QuickCheck, transformers, transformers-compat @@ -48303,8 +48598,8 @@ self: { }: mkDerivation { pname = "bencoding"; - version = "0.4.5.5"; - sha256 = "1mgqn8ais9pshsy8gsqrd559rgck1sm5zw0jyrl5902ns11jacx3"; + version = "0.4.5.6"; + sha256 = "13lnzgimahsnnsgx5gsh688iyw6r2bw97pcmyqq9r8kq0sll61m6"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty text @@ -48815,6 +49110,8 @@ self: { pname = "bifunctors"; version = "5.6.2"; sha256 = "0yk9v71xpwnxd6xia1bdr8pxbvrx4am6bjykqp1d1vk1a0lak1hh"; + revision = "1"; + editedCabalFile = "1gibijw482qj7p9zys27df71kmv94bcq0afrsnvld86nf7njdngz"; libraryHaskellDepends = [ assoc base comonad containers tagged template-haskell th-abstraction transformers @@ -51966,6 +52263,8 @@ self: { pname = "bittrex"; version = "0.6.0.0"; sha256 = "02h8r753dkkkgpzxhycdmjpccdqfsc5gnmw6qi9kpl1165jrd2fd"; + revision = "1"; + editedCabalFile = "1s5xvlsdcw7ihdb1falf5dyw156x30ccahi6hy26xr5wsyp612w3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51987,8 +52286,8 @@ self: { pname = "bitvec"; version = "1.1.5.0"; sha256 = "1ifyz0lsmgqz8yjyx4887m1wnm7ar389k6gkvcnk9mg1bgp7rll3"; - revision = "1"; - editedCabalFile = "14dkxk8hnj9d2d52sgfwv303mdnw3b4xirac1y9qm7hsnxvgsgnb"; + revision = "2"; + editedCabalFile = "16cbbvvjqr4pyiz7j8dpaas2ln7l7y6lczd0lszyx3cgnvv30in0"; libraryHaskellDepends = [ base bytestring deepseq ghc-bignum primitive vector ]; @@ -52300,8 +52599,8 @@ self: { pname = "blank-canvas"; version = "0.7.4"; sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; - revision = "4"; - editedCabalFile = "0a74klkqfy2d9q7chvxwf0n2778wqgdw320rr7ivixlz6bjbwpqg"; + revision = "5"; + editedCabalFile = "0ijknbbczq3x9i8b1vyx0ivla5ijdp4zxri8hcgpkv0fi3l0xrs4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -52690,8 +52989,8 @@ self: { pname = "blaze-svg"; version = "0.3.7"; sha256 = "0pqnx1zrvm2pliya76f4m8d6aycncfp08c2n1fiyzvl1fgk62z2c"; - revision = "2"; - editedCabalFile = "0d8wylydvflhd1yyd91a8ss8khxr5j83f7j7h6qn36zagnyci1f5"; + revision = "3"; + editedCabalFile = "161xnqgy1pchcgg8rrc6b3chr07x8br1shd4sbi2kjl2ms0z858y"; libraryHaskellDepends = [ base blaze-markup mtl ]; description = "SVG combinator library"; license = lib.licenses.bsd3; @@ -53338,16 +53637,27 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.9.0"; - sha256 = "11balgaw73fi3bqnajhs570nfy5lcjzhxdkms2jbxsd80l6n1zx1"; - revision = "1"; - editedCabalFile = "0xll6fdlhr9h9kswn6kdbdk3wbd1z87wsrgr4g3bqsj29bdjqvb7"; + version = "0.0.12.1"; + sha256 = "05aiz02glc6iwfjy8a69zisqq8zg3i5bzmkp0vlyr00k4crd1l0j"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; maintainers = [ lib.maintainers.maralorn ]; }) {}; + "bluefin_0_0_14_0" = callPackage + ({ mkDerivation, bluefin-internal }: + mkDerivation { + pname = "bluefin"; + version = "0.0.14.0"; + sha256 = "14nfg1xrc1c0avlmgmfap9jpj6r6n4rvs4l2bgsjn8hgd4hbqlf4"; + libraryHaskellDepends = [ bluefin-internal ]; + description = "The Bluefin effect system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "bluefin-algae" = callPackage ({ mkDerivation, base, bluefin, bluefin-internal, tasty , tasty-bench, tasty-hunit @@ -53372,8 +53682,27 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.9.0"; - sha256 = "06y5vq24jrm5l3lf2sq43qnc0i8zazrf9g28spmgzjlsqcv84g4d"; + version = "0.0.13.0"; + sha256 = "0plx77x4xdqy51485kkrpy0inshv9dx1c4h4iry3i4gqyywbdxr8"; + libraryHaskellDepends = [ + async base monad-control transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ base ]; + description = "The Bluefin effect system, internals"; + license = lib.licenses.mit; + }) {}; + + "bluefin-internal_0_0_14_0" = callPackage + ({ mkDerivation, async, base, monad-control, transformers + , transformers-base, unliftio-core + }: + mkDerivation { + pname = "bluefin-internal"; + version = "0.0.14.0"; + sha256 = "10rs1fv5hv60lrbh0zbcbapcafdqrglzjc86vb8f73kwhq6b8w71"; + revision = "1"; + editedCabalFile = "1dr1ls83ana7cvj75y62gsjazaq6c2mya4paawknxbx6aniqgnnh"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -53381,6 +53710,7 @@ self: { testHaskellDepends = [ base ]; description = "The Bluefin effect system, internals"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "bluemix-sdk" = callPackage @@ -55085,7 +55415,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_2_4" = callPackage + "brick_2_6" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens , microlens-mtl, microlens-th, mtl, QuickCheck, stm @@ -55094,8 +55424,10 @@ self: { }: mkDerivation { pname = "brick"; - version = "2.4"; - sha256 = "124l7yay5q5dxmpf48a4m8b7fnkwpv0shsy78qjpw5fdvqf9xkvz"; + version = "2.6"; + sha256 = "19630fcg72y1vynrgssyn78xcrhmzyh4qaapynj3bkgmqm7d6qfk"; + revision = "1"; + editedCabalFile = "1nvswfwb4bj76vx20nq04nywqq38jaq9296wzi6hqa0rzsajva4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55172,8 +55504,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.14"; - sha256 = "1gyc59y2ch2w5chiyx1d1s6rd71cvgvccmdfkbyzvcm8sywaqnnr"; + version = "0.1.1.16"; + sha256 = "0mhvys0sa3z1a7cchaa7dg2jv2dskyw33484ahgivgrxn6014bcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55227,8 +55559,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.12"; - sha256 = "0ss1rakdpv82pbyf9cnfd3sysap2ggjc7cpz4vh46w55ivy3ba3n"; + version = "2.2.0.15"; + sha256 = "192496bbxbs8fd95r373b13hyyvd66rspl658d0alckwahn23n6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55384,6 +55716,86 @@ self: { broken = true; }) {}; + "brillo" = callPackage + ({ mkDerivation, base, bmp, brillo-rendering, bytestring + , containers, ghc-prim, GLFW-b, OpenGL + }: + mkDerivation { + pname = "brillo"; + version = "1.13.3"; + sha256 = "16xb0ii3mhlz4ppl2ifmskq70i6bkwk2my28gp7xfxq1dviqzmh8"; + libraryHaskellDepends = [ + base bmp brillo-rendering bytestring containers ghc-prim GLFW-b + OpenGL + ]; + description = "Painless 2D vector graphics, animations, and simulations powered by GLFW"; + license = lib.licenses.mit; + }) {}; + + "brillo-algorithms" = callPackage + ({ mkDerivation, base, brillo, containers, ghc-prim }: + mkDerivation { + pname = "brillo-algorithms"; + version = "1.13.3"; + sha256 = "0mbvi03f24vvp9zbipib869v68syfx8lpwzsx0q2ljx3axrxwi8d"; + libraryHaskellDepends = [ base brillo containers ghc-prim ]; + description = "Data structures and algorithms for working with 2D graphics"; + license = lib.licenses.mit; + }) {}; + + "brillo-examples" = callPackage + ({ mkDerivation, base, bmp, brillo, brillo-algorithms + , brillo-rendering, bytestring, containers, ghc-prim, GLFW-b + , random, vector + }: + mkDerivation { + pname = "brillo-examples"; + version = "1.13.3"; + sha256 = "0ygg78kkxksaj0qh46rxza4hwrr97985hhcjkqh2gin7bpgy89mj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bmp brillo brillo-algorithms brillo-rendering bytestring + containers ghc-prim GLFW-b random vector + ]; + description = "Examples using the Brillo library"; + license = lib.licenses.mit; + }) {}; + + "brillo-juicy" = callPackage + ({ mkDerivation, base, bmp, brillo, bytestring, JuicyPixels, vector + }: + mkDerivation { + pname = "brillo-juicy"; + version = "0.2.4"; + sha256 = "1aqvxrxfyfjvhzgjxqivfjsyg06lgsz2irk1j52q14rmydd8h2di"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bmp brillo bytestring JuicyPixels vector + ]; + executableHaskellDepends = [ + base bmp brillo bytestring JuicyPixels vector + ]; + description = "Load any image supported by Juicy.Pixels in your brillo application"; + license = lib.licenses.bsd3; + mainProgram = "brillo-juicy-viewer"; + }) {}; + + "brillo-rendering" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, OpenGL, vector + }: + mkDerivation { + pname = "brillo-rendering"; + version = "1.13.3"; + sha256 = "0apczzdk7fwkjjkm32rv7i39pjl8jnax9bbgjd8p1095dnqhawiy"; + libraryHaskellDepends = [ + base bmp bytestring containers OpenGL vector + ]; + description = "Brillo picture data types and rendering functions"; + license = lib.licenses.mit; + }) {}; + "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra @@ -56161,6 +56573,29 @@ self: { license = lib.licenses.mit; }) {}; + "bugsnag_1_1_0_1" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, bugsnag-hs + , bytestring, containers, Glob, hspec, http-client, http-client-tls + , parsec, template-haskell, text, th-lift-instances, ua-parser + , unliftio, unordered-containers + }: + mkDerivation { + pname = "bugsnag"; + version = "1.1.0.1"; + sha256 = "1n2lq9iyz5m0s1mx22cwaci18f9i37g6xgdq3nbbyysmylrw09w2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson annotated-exception base bugsnag-hs bytestring containers + Glob http-client http-client-tls parsec template-haskell text + th-lift-instances ua-parser unliftio unordered-containers + ]; + testHaskellDepends = [ annotated-exception base hspec unliftio ]; + description = "Bugsnag error reporter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugsnag-haskell" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, containers, doctest, Glob, hspec, http-client @@ -56272,6 +56707,8 @@ self: { pname = "bugzilla-redhat"; version = "1.0.1.1"; sha256 = "0ka3dh5gqimwny7s3qalkynlyarkmnwd5pcy92b4g4vaqk7k3pvr"; + revision = "3"; + editedCabalFile = "1a50ffp5dahwc82ps78j7mpvi3xbd1by3xpkybxz8bz7i3fsazfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57076,6 +57513,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytebuild_0_3_16_3" = callPackage + ({ mkDerivation, base, byteslice, bytestring, gauge + , haskell-src-meta, integer-logarithms, natural-arithmetic + , primitive, primitive-offset, QuickCheck, quickcheck-instances + , run-st, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, text-short, wide-word, zigzag + }: + mkDerivation { + pname = "bytebuild"; + version = "0.3.16.3"; + sha256 = "0l88c5c1i704g87zvnpazfmcppg90b5q5cd6q5k75yx4x9vdcc88"; + libraryHaskellDepends = [ + base byteslice bytestring haskell-src-meta integer-logarithms + natural-arithmetic primitive primitive-offset run-st + template-haskell text text-short wide-word zigzag + ]; + testHaskellDepends = [ + base byteslice bytestring natural-arithmetic primitive QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + text-short wide-word + ]; + benchmarkHaskellDepends = [ + base byteslice gauge natural-arithmetic primitive text-short + ]; + description = "Build byte arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytedump" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -57125,6 +57591,8 @@ self: { pname = "bytehash"; version = "0.1.1.2"; sha256 = "1vj08viavj5finkwq6hmljhf31q80akfiqxxiw7q4awpcgbgbwdc"; + revision = "1"; + editedCabalFile = "1vga0y6nlhir3q24vmhzl0n9py19r7prciyqsizpcszplmrymr0l"; libraryHaskellDepends = [ base byteslice bytestring containers entropy primitive primitive-unlifted transformers @@ -57227,6 +57695,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytes_0_17_4" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal + , containers, hashable, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.17.4"; + sha256 = "14x3wnjg7ik1kh3vy9ahfal0hl86v8z3kj1h152364mf94j9macc"; + revision = "1"; + editedCabalFile = "0jhzp9ihka03fsgnjhhj3864p3zq500xqm2whjyvin3580wigc97"; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + scientific text time transformers transformers-compat + unordered-containers void + ]; + description = "Sharing code for serialization between binary and cereal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytes-metrics" = callPackage ({ mkDerivation, base, byteslice, contiguous, gauge, primitive , quickcheck-classes-base, random, tasty, tasty-hunit @@ -57294,6 +57783,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "byteslice_0_2_14_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, natural-arithmetic + , primitive, primitive-addr, primitive-unlifted, quickcheck-classes + , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short + , transformers, tuples, vector + }: + mkDerivation { + pname = "byteslice"; + version = "0.2.14.0"; + sha256 = "0s9cnb7p1wr5vh3j95a952222xf2xzli451las5il3n04n4rxq1n"; + libraryHaskellDepends = [ + base bytestring natural-arithmetic primitive primitive-addr + primitive-unlifted run-st text text-short tuples vector + ]; + testHaskellDepends = [ + base bytestring primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "Slicing managed and unmanaged memory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytesmith" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, natural-arithmetic, primitive, tasty @@ -57316,21 +57829,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "bytestring_0_12_1_0" = callPackage + "bytestring_0_12_2_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck, random, syb , tasty, tasty-bench, tasty-quickcheck, template-haskell , transformers }: mkDerivation { pname = "bytestring"; - version = "0.12.1.0"; - sha256 = "136c0v2brc4a1fpbqplpqxj4kzd5r78lgm5qvdnwv9blxykbihzb"; - revision = "1"; - editedCabalFile = "1f846kw3jal10x6r3xnzd97mwzjzr6g510r907j46w8ijwf9xrwq"; + version = "0.12.2.0"; + sha256 = "18zvh1fpj8x4w35hrcp1l8cd9x7v401s17wn5l5vlbgwhdrimnif"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ - base deepseq ghc-prim QuickCheck syb tasty tasty-quickcheck - template-haskell transformers + base deepseq QuickCheck syb tasty tasty-quickcheck template-haskell + transformers ]; benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; @@ -57985,6 +58496,33 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0_4" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0.4"; + sha256 = "0c7nhc3a93x648yf8pq5js81zr97fnfiahg2hjbn999nbwg89800"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + description = "Streaming compression/decompression via conduits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "bzlib-conduit-jappie" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit , data-default-class, hspec, mtl, random, resourcet @@ -58199,8 +58737,8 @@ self: { pname = "c2hs"; version = "0.28.8"; sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; - revision = "2"; - editedCabalFile = "14j3sjxvwhj32zpz0iyigc6wdn6pjm3vlgs0prq0grvk48p176f3"; + revision = "3"; + editedCabalFile = "1f1jxkj89bms4hsqwl47hldixfdx96l66cs8zjlf8i6j7c9qiz3s"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -58476,34 +59014,34 @@ self: { , conduit-extra, containers, cryptonite, deepseq, directory , exceptions, filepath, generic-lens, Glob, hedgehog , hedgehog-extras, hspec, hspec-discover, http-client - , http-client-tls, http-types, hw-hspec-hedgehog, lens, mtl - , network-uri, oops, optparse-applicative, process, raw-strings-qq - , relation, resourcet, stm, stringsearch, temporary, text, time - , topograph, transformers, unliftio + , http-client-tls, http-types, hw-hspec-hedgehog, hw-prelude, lens + , microlens, mtl, network-uri, oops, optparse-applicative, process + , raw-strings-qq, relation, resourcet, stm, stringsearch, temporary + , text, time, topograph, unliftio }: mkDerivation { pname = "cabal-cache"; - version = "1.0.6.0"; - sha256 = "0jjybnj06f8w3fh44q3mq28fvyd1v7yfbh0rrkxsikdxnhi74z9j"; + version = "1.1.0.2"; + sha256 = "09vyxp5bx4mfwjaz7vfniy4b2n79dwa02bgb4yzxigw0q8gvkfv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 attoparsec base bytestring conduit-extra containers cryptonite deepseq directory exceptions - filepath generic-lens http-client http-client-tls http-types lens - mtl network-uri oops optparse-applicative process relation - resourcet stm text topograph transformers + filepath generic-lens http-client http-client-tls http-types + hw-prelude microlens mtl network-uri oops optparse-applicative + process relation resourcet stm text topograph ]; executableHaskellDepends = [ aeson amazonka amazonka-core base bytestring cabal-install-parsers - containers directory exceptions filepath generic-lens lens mtl - network-uri oops optparse-applicative resourcet stm stringsearch - temporary text unliftio + containers directory exceptions filepath generic-lens hw-prelude + lens microlens network-uri oops optparse-applicative resourcet stm + stringsearch temporary text unliftio ]; testHaskellDepends = [ aeson amazonka base bytestring directory exceptions filepath Glob - hedgehog hedgehog-extras hspec http-types hw-hspec-hedgehog lens - mtl network-uri oops raw-strings-qq text time + hedgehog hedgehog-extras hspec http-types hw-hspec-hedgehog + hw-prelude network-uri oops raw-strings-qq text time ]; testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; @@ -58606,8 +59144,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.4"; - sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; + version = "5.2.5"; + sha256 = "0nkrvs1a9kj2nqz9pklxzni5wbirwgqim9haqn8lglqliycrdzbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58703,8 +59241,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.10"; - sha256 = "1lwl7q85gfgh5swi9bdck7r5g5s2pc9csgpcpvf2jmv193yd1jl1"; + version = "1.0.11"; + sha256 = "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for running doctests"; license = lib.licenses.bsd3; @@ -59029,32 +59567,32 @@ self: { , bytestring, Cabal, Cabal-described, cabal-install-solver , Cabal-QuickCheck, Cabal-syntax, Cabal-tests, Cabal-tree-diff , containers, cryptohash-sha256, directory, echo, edit-distance - , exceptions, filepath, hackage-security, hashable, HTTP, lukko - , mtl, network-uri, open-browser, parsec, pretty, pretty-show - , process, QuickCheck, random, regex-base, regex-posix, resolv + , exceptions, filepath, hackage-security, HTTP, lukko, mtl + , network-uri, open-browser, parsec, pretty, pretty-show, process + , QuickCheck, random, regex-base, regex-posix, resolv , safe-exceptions, semaphore-compat, stm, tagged, tar, tasty , tasty-expected-failure, tasty-golden, tasty-hunit , tasty-quickcheck, text, time, tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.12.1.0"; - sha256 = "1cmifq189i4x0r0yha3dl8nrzzfh92bnd2saak7dqvvjkkysqj38"; + version = "3.14.1.0"; + sha256 = "18cdb2wvic41d6259na9c7ivlgzy89ci8q6d87ri0j0n4x0xkfjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal cabal-install-solver Cabal-syntax containers cryptohash-sha256 directory echo edit-distance exceptions filepath hackage-security - hashable HTTP lukko mtl network-uri open-browser parsec pretty - process random regex-base regex-posix resolv safe-exceptions + HTTP lukko mtl network-uri open-browser parsec pretty process + random regex-base regex-posix resolv safe-exceptions semaphore-compat stm tar text time unix zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ array base bytestring Cabal Cabal-described cabal-install-solver Cabal-QuickCheck Cabal-syntax Cabal-tests Cabal-tree-diff - containers directory filepath hashable mtl network-uri pretty-show + containers directory filepath mtl network-uri pretty-show process QuickCheck random tagged tar tasty tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck time tree-diff zlib ]; @@ -59174,16 +59712,16 @@ self: { }: mkDerivation { pname = "cabal-install-solver"; - version = "3.12.1.0"; - sha256 = "0yjy49awzs79adx1xn705v3cpmqhvgpym49jaws9h0z9ag9s3nvi"; + version = "3.14.1.0"; + sha256 = "0gcccglkhz8kjjvqas79wn402c5im2fqqzms453hj0i28j0y4ydm"; libraryHaskellDepends = [ array base bytestring Cabal Cabal-syntax containers directory edit-distance filepath mtl network-uri pretty text transformers ]; testHaskellDepends = [ - base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck + base Cabal-syntax tasty tasty-hunit tasty-quickcheck ]; - description = "The command-line interface for Cabal and Hackage"; + description = "The solver component of cabal-install"; license = lib.licenses.bsd3; }) {}; @@ -59453,6 +59991,8 @@ self: { pname = "cabal-rpm"; version = "2.2.1"; sha256 = "0dsbnnvzss0flknf1c2fq85y9a4d26nbrlnrh2xcyfwh2mz20c9d"; + revision = "1"; + editedCabalFile = "1ad0j7qykd5wbn1gdfrkbc50s707h3p0ll8nfqv0if8q1bck3w8l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59856,6 +60396,8 @@ self: { pname = "cabal2spec"; version = "2.7.1"; sha256 = "0w1f7ga7nz4112x9k4g75nxpcwvcdfif0bfzk3fg8bghzijf12bd"; + revision = "1"; + editedCabalFile = "0kz3d4nq4z4mdk9pzbzzxvnac0krc0gyzm470hnjcrd06xwsjk46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -60431,6 +60973,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; + "cairo-image_0_1_0_4" = callPackage + ({ mkDerivation, base, c-enum, cairo, primitive, template-haskell + }: + mkDerivation { + pname = "cairo-image"; + version = "0.1.0.4"; + sha256 = "1piib7npzr9101f3bi8mn7h5prs4c9iwwdil06b8isq7p5xvvh50"; + libraryHaskellDepends = [ base c-enum primitive template-haskell ]; + libraryPkgconfigDepends = [ cairo ]; + testHaskellDepends = [ base c-enum primitive template-haskell ]; + description = "Image for Cairo"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "cake" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmdargs , containers, derive, directory, filepath, mtl, parsek, process @@ -60697,6 +61254,8 @@ self: { pname = "calendar-recycling"; version = "0.0.0.1"; sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc"; + revision = "1"; + editedCabalFile = "0dp0gylbwsrrszg5nw7x38xhilmn0vgn79zl9bam024nb528x7m1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60785,6 +61344,8 @@ self: { pname = "call-alloy"; version = "0.5.0.1"; sha256 = "0c34yd6l0650qk760mmgsfgmwvhqhs43nzm7nhzkps5z1p966wmc"; + revision = "2"; + editedCabalFile = "0hgy6daai4i0y5rz4350dzwz4wrwlyrr5d2c7k8d6hc4d8dlhqvm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory exceptions extra @@ -60829,6 +61390,8 @@ self: { pname = "call-plantuml"; version = "0.0.1.3"; sha256 = "0g6k5ajfdnhdni2ml31mhlgdvpkdnjsdyrppj15q8v964h68cjxk"; + revision = "1"; + editedCabalFile = "1qxk5p0i44sjxd4jbgpzrcfc9xqmj86q6d52fwz32qbc76v4rl1q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring filepath process ]; testHaskellDepends = [ @@ -63784,8 +64347,8 @@ self: { pname = "cgi"; version = "3001.5.0.1"; sha256 = "044gfqfdw5xdr6mzp5i3956a5fcj15j32zwzzd6ym15nxgrvjqh3"; - revision = "2"; - editedCabalFile = "1vx49bxgiip1mb8lh5qcvdb9qww474x44a8x5kj087a3npad0xxw"; + revision = "3"; + editedCabalFile = "1l21iiqd340crhf7dbi05ldj5wrfz00gwacz45ldca0w7821wa9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63957,6 +64520,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "chakra-exe"; + broken = true; }) {}; "chalk" = callPackage @@ -64223,6 +64787,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "charset_0_3_11" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , unordered-containers + }: + mkDerivation { + pname = "charset"; + version = "0.3.11"; + sha256 = "1b4aq0y3cijicfxxvpr7h0y9sq8x64f4c6525as6b614d5spahwk"; + libraryHaskellDepends = [ + array base bytestring containers unordered-containers + ]; + description = "Fast unicode character sets based on complemented PATRICIA tries"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "charsetdetect" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -64300,7 +64880,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_7_0_0" = callPackage + "chart-svg_0_8_0_0" = callPackage ({ mkDerivation, base, bytestring, Color, containers, cubicbezier , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl , numhask, numhask-space, optics-core, random, string-interpolate @@ -64308,8 +64888,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.7.0.0"; - sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; + version = "0.8.0.0"; + sha256 = "0h2jh3zv26f8smpsxw7pc0ndn2ai64c7rfpamhmyyj8ngavlkz7l"; libraryHaskellDepends = [ base bytestring Color containers cubicbezier flatparse formatn harpie markup-parse mtl numhask numhask-space optics-core random @@ -64767,6 +65347,8 @@ self: { pname = "chell"; version = "0.5.0.2"; sha256 = "1iy1x5pn5y08zsl5f79vfxjm0asi2vy9hrags7jj9s8fh1dh7fxv"; + revision = "2"; + editedCabalFile = "1il4yzg8q9m5vyynwra8fgx8rik409d07a0mmqxb3xr9ww1d5vyy"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -64781,6 +65363,8 @@ self: { pname = "chell-hunit"; version = "0.3.0.2"; sha256 = "1ms7dysxl4asw3inm2a91838djgbjxd66gpvlp08573s90hyns9d"; + revision = "1"; + editedCabalFile = "084z9nf7jydk0g6hxqgmrf73mc3d1rmqr31dmib1i57g8bdai37d"; libraryHaskellDepends = [ base chell HUnit ]; description = "HUnit support for Chell"; license = lib.licenses.mit; @@ -64792,6 +65376,8 @@ self: { pname = "chell-quickcheck"; version = "0.2.5.4"; sha256 = "046cs6f65s9nrsac6782gw4n61dpgjgz7iv7p8ag6civywj32m4i"; + revision = "1"; + editedCabalFile = "10g0jb9nh7zsclsj80j0awyrb73jkz30r6aa48ffr3li59182m1z"; libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for Chell"; license = lib.licenses.mit; @@ -64837,8 +65423,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.4.0"; - sha256 = "1dbbhpvpnrlx3a4a66q0732fdvb132xax0p5fh41xfhjfxxspzf2"; + version = "0.9.5.0"; + sha256 = "1yva5hx7623l7f0am99kvpcjk924vklipjw4jb2pryi79wgvyqys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65415,6 +66001,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "chronos_1_1_6_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice + , bytesmith, bytestring, criterion, deepseq, hashable, HUnit + , natural-arithmetic, old-locale, primitive, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, text-short, thyme, time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.1.6.2"; + sha256 = "08y8s9mwb69kisi0yhng6plvasy6jnj25i4ar8k2cq3vsf6bgx73"; + libraryHaskellDepends = [ + aeson attoparsec base bytebuild byteslice bytesmith bytestring + deepseq hashable natural-arithmetic primitive text text-short + torsor vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text text-short thyme time + ]; + description = "A high-performance time library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -65449,12 +66064,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "chs-cabal_0_1_1_2" = callPackage + "chs-cabal_0_1_1_4" = callPackage ({ mkDerivation, base, Cabal, chs-deps }: mkDerivation { pname = "chs-cabal"; - version = "0.1.1.2"; - sha256 = "1qh234dx3d3l3nxb67alv0ggwqipp1502krq11fgq3hp0jhcm8b8"; + version = "0.1.1.4"; + sha256 = "1y9z3ymvsldl4kjjdzagx0p3i7s5lyrsipd29bx2nqv05ldgrkip"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -65695,27 +66310,28 @@ self: { }) {}; "cimple" = callPackage - ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, base - , bytestring, containers, data-fix, extra, file-embed, filepath - , groom, happy, hspec, hspec-discover, monad-parallel, mtl - , QuickCheck, split, text, transformers-compat + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , data-fix, extra, file-embed, filepath, groom, happy, hspec + , hspec-discover, monad-parallel, mtl, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, split, text + , transformers-compat }: mkDerivation { pname = "cimple"; - version = "0.0.21"; - sha256 = "1ffqbnsbcza7bfgbbsilyhvifyg3g9j5wpkgmawlw76c5rkk3a7c"; + version = "0.0.22"; + sha256 = "0dp62wqcrdf16mrs10ij59y2ncrbm3nplp3h8qszmq4csiq8scfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base bytestring containers data-fix - file-embed filepath monad-parallel mtl split text - transformers-compat + aeson array base bytestring containers data-fix file-embed filepath + monad-parallel mtl prettyprinter prettyprinter-ansi-terminal split + text transformers-compat ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring groom text ]; testHaskellDepends = [ - ansi-wl-pprint base data-fix extra hspec QuickCheck text - transformers-compat + base data-fix extra hspec prettyprinter prettyprinter-ansi-terminal + QuickCheck text transformers-compat ]; testToolDepends = [ hspec-discover ]; description = "Simple C-like programming language"; @@ -66183,6 +66799,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "citeproc_0_8_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific + , text, timeit, transformers, unicode-collation, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.8.1.2"; + sha256 = "1w3pdnqmhkk3iiih9z5n70igawcv584rdyn2qikjcjcf60lcr681"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types safe scientific text + transformers unicode-collation uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -67084,8 +67728,8 @@ self: { pname = "clay"; version = "0.15.0"; sha256 = "1gp7x76cw15jmd3ahqf1q0bc2p6ix182x6s2pzyh8yr4b29b9r3v"; - revision = "1"; - editedCabalFile = "0y6s4digka4b0d238n1vcj2308csxvkr34vfnqr3mc46079vb99k"; + revision = "2"; + editedCabalFile = "174jkyq4yjk022msd2rq0wlp4myy9fa92w28d4nwd7jrwghw5qki"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -67892,8 +68536,8 @@ self: { }: mkDerivation { pname = "climb"; - version = "0.5.0"; - sha256 = "0bb2pnh3wb78gym5jyzy9dsw6cvqcmlmy79gbvwyalrx237krvl8"; + version = "0.5.1"; + sha256 = "0sn3cn9l1ibbr1vm87phxwdlcwwgwlvannm14v5r6af3b274ibhy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69108,6 +69752,44 @@ self: { license = lib.licenses.mpl20; }) {}; + "co-log-core_0_3_2_3" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.3.2.3"; + sha256 = "0yaks45p2w3839acb4h23rf83qdip6x9qgyj34h2qr7741jn8w3d"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "co-log-effectful" = callPackage + ({ mkDerivation, base, bytestring, co-log-core, effectful + , effectful-core, effectful-plugin, QuickCheck, tasty + , tasty-discover, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "co-log-effectful"; + version = "0.0.0.1"; + sha256 = "11l0j1aa6hcimarjgvvicpa6l8fzmqlvn5d0igrg7bbbq20mk451"; + revision = "1"; + editedCabalFile = "19370njmzvm14kjkyyclkmwxz6kj6gh5pvwnzv1187a5rfyhhjix"; + libraryHaskellDepends = [ + base bytestring co-log-core effectful effectful-core + effectful-plugin text + ]; + testHaskellDepends = [ + base bytestring co-log-core effectful effectful-core + effectful-plugin QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + description = "effectful log effect using co-log-core"; + license = lib.licenses.bsd3; + }) {}; + "co-log-json" = callPackage ({ mkDerivation, aeson, base, bytestring, co-log-core, containers , string-conv, text @@ -69652,18 +70334,27 @@ self: { }) {}; "coercible-subtypes" = callPackage - ({ mkDerivation, base, profunctors }: + ({ mkDerivation, base }: mkDerivation { pname = "coercible-subtypes"; - version = "0.3.0.1"; - sha256 = "1mji6jlgc2lk6lczn10c2rchm10h2my3gs9p3r9yd6ij8ixki4sx"; - revision = "1"; - editedCabalFile = "000w9bg2r1n6r40a40i450gysq8yr59xpjrqwf6dzgzyxxfa9sxb"; - libraryHaskellDepends = [ base profunctors ]; + version = "1"; + sha256 = "02xj06qdqy9i33hkp504qmgpb0qvhliyygib072s2k6z4wmwd1ar"; + libraryHaskellDepends = [ base ]; description = "Coercible but only in one direction"; license = lib.licenses.bsd3; }) {}; + "coercible-subtypes-profunctor" = callPackage + ({ mkDerivation, base, coercible-subtypes, profunctors }: + mkDerivation { + pname = "coercible-subtypes-profunctor"; + version = "1"; + sha256 = "0riw18jpxvfv6qyzmv3l7g4m6b65g7skcylpmwdp59p05ypfx4vb"; + libraryHaskellDepends = [ base coercible-subtypes profunctors ]; + description = "Combine profunctors with coercible-subtypes"; + license = lib.licenses.bsd3; + }) {}; + "coercible-utils" = callPackage ({ mkDerivation, base, gauge }: mkDerivation { @@ -69912,6 +70603,8 @@ self: { pname = "coinor-clp"; version = "0.0.0.2"; sha256 = "0bcwpzmsmf9s8nn7vkwfynjb75x1x8x6bpffmrs55yqc6rvdsn32"; + revision = "1"; + editedCabalFile = "011nb1ig1k123223q3glrdxfxf9jy4k2n12rm6fgfh8q0xlr1ri2"; libraryHaskellDepends = [ base comfort-array deepseq linear-programming non-empty QuickCheck transformers utility-ht @@ -70204,8 +70897,8 @@ self: { pname = "colonnade"; version = "1.2.0.2"; sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; - revision = "6"; - editedCabalFile = "1ny5nbrf5nic2xsilz7xg44y2bcviki6gs4rmg6ydfk5v291qfgn"; + revision = "7"; + editedCabalFile = "043fv0vr7m04lrcnh5561wn62qda4wkjvsakj6db5zjhwbmwm3qy"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -70418,8 +71111,8 @@ self: { pname = "colourista"; version = "0.1.0.2"; sha256 = "0g06116kjg9pbp0l7n33agqbks3kw5z4rjqyhylha8miah5sxbwn"; - revision = "5"; - editedCabalFile = "1388d2hd4kv6d99mfvif8iivb9kwai4dcnm3s9a6x91sz4zkzj2y"; + revision = "6"; + editedCabalFile = "1vdz4msdl6plsshf4h61wlv231yyv6hjw3h4sgnasqnsav19dd5z"; libraryHaskellDepends = [ ansi-terminal base bytestring text ]; testHaskellDepends = [ base bytestring hspec text ]; description = "Convenient interface for printing colourful messages"; @@ -70712,6 +71405,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "combinators" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "combinators"; + version = "0.1"; + sha256 = "0qn5jz5zhlcygah450pvqcrksh7bpwp46jq1f0wmcb9bk0i3s9vz"; + libraryHaskellDepends = [ base mtl ]; + description = "Collection of combinators over standard typeclasses"; + license = lib.licenses.mit; + }) {}; + "combobuffer" = callPackage ({ mkDerivation, base, containers, template-haskell, vector , vector-space @@ -70835,8 +71539,8 @@ self: { pname = "comfort-glpk"; version = "0.1"; sha256 = "06396jgbaxvm2gwksra6gjwqczsvdlif9lal46a8q5sc5cyhcpx1"; - revision = "1"; - editedCabalFile = "0hd4i7s68kfky7l6mdka4p144x4h7fbl619ikwq8fg3fdljvihmq"; + revision = "2"; + editedCabalFile = "0gklb3jxb038bf657gqv37wlibvvr1yy3bdg7zvfvx81s203ja7h"; libraryHaskellDepends = [ base comfort-array deepseq glpk-headers linear-programming non-empty transformers utility-ht @@ -70911,8 +71615,8 @@ self: { }: mkDerivation { pname = "comma-and"; - version = "0.1.0.0"; - sha256 = "13z5z7c2xgljxk9lr786wbmayyqng3pp16pkhv6ch9p0a0adwwkc"; + version = "0.2.0.0"; + sha256 = "10q50gxibzm5ph37i2kgmyg38n6n36dm82qifn8q10c777v3x17x"; libraryHaskellDepends = [ base data-default-class ]; testHaskellDepends = [ base data-default-class hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -71088,6 +71792,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_5_6" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.5.6"; + sha256 = "0yf3063h9kvy2psfl6ssg7ikwy2g55q61hkky3cm2jcj0z5c3j2r"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -71103,6 +71829,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-pandoc_0_2_2_3" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.2.3"; + sha256 = "1jjsagf4gcbvzn89abwrczr8xprqnp0mn7bjw3m5lf34nbnd2dza"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-simple" = callPackage ({ mkDerivation, aeson, base, commonmark, commonmark-extensions , commonmark-pandoc, containers, megaparsec, pandoc-types, parsec @@ -71233,6 +71975,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "comonad_5_0_9" = callPackage + ({ mkDerivation, base, containers, distributive + , indexed-traversable, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.9"; + sha256 = "12d7g3c2x1jb6jlmdgwdmi840z3p91b0l7fkfsdml1c0kas0xyv9"; + libraryHaskellDepends = [ + base containers distributive indexed-traversable tagged + transformers transformers-compat + ]; + description = "Comonads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -71517,8 +72276,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { pname = "compactmap"; - version = "0.1.4.4"; - sha256 = "0ipa92sidhj154mslis6s33sn55x2n6kqqfnd9qgxlns0srsr75n"; + version = "0.1.4.5"; + sha256 = "1xa4wa4qjd7yjghkaakpgrz9kw4iyy0zlc9cpajyysaxdq4k7czf"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A read-only memory-efficient key-value store"; @@ -74876,6 +75635,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "constrained-some" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "constrained-some"; + version = "0.1.2"; + sha256 = "1am445b5ip0k37ml8l041az3dykc4s78kx29r1cvlkf1s8111klz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Existential type that can be constrained"; + license = lib.licenses.mit; + }) {}; + "constraint" = callPackage ({ mkDerivation, base, category, unconstrained }: mkDerivation { @@ -75061,6 +75832,34 @@ self: { broken = true; }) {}; + "construct_0_3_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest + , cereal, directory, doctest, filepath, incremental-parser + , input-parsers, markdown-unlit, monoid-subclasses, parsers + , rank2classes, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "construct"; + version = "0.3.2"; + sha256 = "19pghvfxn1cpvg01ks5ixmfcfdzcbcy01aa2gafm3cgi3i9yygmv"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base bytestring cereal incremental-parser input-parsers + monoid-subclasses parsers rank2classes text + ]; + testHaskellDepends = [ + attoparsec base bytestring cereal directory doctest filepath + incremental-parser monoid-subclasses rank2classes tasty tasty-hunit + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Haskell version of the Construct library for easy specification of file formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "constructible" = callPackage ({ mkDerivation, base, binary-search, complex-generic , integer-roots @@ -75854,17 +76653,6 @@ self: { }) {}; "control-monad-omega" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "control-monad-omega"; - version = "0.3.2"; - sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n"; - libraryHaskellDepends = [ base ]; - description = "A breadth-first list monad"; - license = lib.licenses.publicDomain; - }) {}; - - "control-monad-omega_0_3_3" = callPackage ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: mkDerivation { pname = "control-monad-omega"; @@ -75875,7 +76663,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench ]; description = "A breadth-first list monad"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "control-monad-queue" = callPackage @@ -76266,15 +77053,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot_4_0" = callPackage + "copilot_4_1" = callPackage ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language , copilot-libraries, copilot-prettyprinter, copilot-theorem , directory, filepath, optparse-applicative }: mkDerivation { pname = "copilot"; - version = "4.0"; - sha256 = "1vkwrrsl2xlga5imv2w54k71bl8i1qxz53d6frwpnv64hq0g8lrz"; + version = "4.1"; + sha256 = "04zhqkkp66alvk6b2mhgdvdg2d9yjyyzmv7vp7caj13cyqrifflz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76295,8 +77082,8 @@ self: { }: mkDerivation { pname = "copilot-bluespec"; - version = "4.0"; - sha256 = "1255x4bfwsv305gw0crwm64n32znbzg3g07rly66j56p6dil9dw6"; + version = "4.1"; + sha256 = "0czx7jwhrg024wfk6g1mcjgm8ydc5xx8msgklzhs97gwlhhi74sb"; libraryHaskellDepends = [ base copilot-core directory filepath language-bluespec pretty ]; @@ -76335,7 +77122,7 @@ self: { broken = true; }) {}; - "copilot-c99_4_0" = callPackage + "copilot-c99_4_1" = callPackage ({ mkDerivation, base, copilot-core, directory, filepath, HUnit , language-c99, language-c99-simple, mtl, pretty, process , QuickCheck, random, test-framework, test-framework-hunit @@ -76343,8 +77130,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "4.0"; - sha256 = "1gnkcwqamc63fw64d5vcjxsffjhgz627p0rs4lnjn2wpqj23ms3b"; + version = "4.1"; + sha256 = "0lqjqji6v7bxavqlg367837n7qvdlba11y0x24pkl6djdwq4rx5p"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -76393,14 +77180,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-core_4_0" = callPackage + "copilot-core_4_1" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-core"; - version = "4.0"; - sha256 = "0gwl08ib42if8lrwkhd81vpx46yqbl2k1qwwf3ar90b6pnhczyhk"; + version = "4.1"; + sha256 = "0w1bpf2sqmwjsk5pbf5wglmmgi26xa9ns497cs0dqz4v278v98yj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -76446,14 +77233,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-interpreter_4_0" = callPackage + "copilot-interpreter_4_1" = callPackage ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-interpreter"; - version = "4.0"; - sha256 = "16ylwz3zplzrgz1z0894022ikmh9zywqsjhczayl65gi4aphi925"; + version = "4.1"; + sha256 = "016qvssn4hp3nllv9xxsx2d6z4z5m4kq8js5k10dcnhxbkr2bngz"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -76487,7 +77274,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-language_4_0" = callPackage + "copilot-language_4_1" = callPackage ({ mkDerivation, array, base, containers, copilot-core , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl , pretty, QuickCheck, test-framework, test-framework-hunit @@ -76495,8 +77282,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "4.0"; - sha256 = "1mkf3p5arwdjxwyjflisdmc1xdz0x5p6iarh544ngpwks72j6j7d"; + version = "4.1"; + sha256 = "04qa8i4gyvvv3la5qhdqbam0g8kxny6miv4z65g6crwdp9x7bdyv"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-theorem data-reify mtl @@ -76531,15 +77318,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-libraries_4_0" = callPackage + "copilot-libraries_4_1" = callPackage ({ mkDerivation, base, containers, copilot-interpreter , copilot-language, copilot-theorem, mtl, parsec, QuickCheck , test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-libraries"; - version = "4.0"; - sha256 = "0zgw4pg0kdq5c4xqpf51wpkxj1sxhyif71j103kdc4ca1wwqhjbr"; + version = "4.1"; + sha256 = "04vgskgq20q62ybd1lm19bqgqabhfbb6v5vqj92gv9dk4861lahd"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -76563,12 +77350,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-prettyprinter_4_0" = callPackage + "copilot-prettyprinter_4_1" = callPackage ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "4.0"; - sha256 = "17vw8h6c0x1x7giwkzqrg2sndw9qp7ninh6lcydzlcn77ma9i0z2"; + version = "4.1"; + sha256 = "0hd3dghc62wi1rj0ilwdgjw60kvbrqhcwdc502r0xny9ha9b6ws5"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -76616,7 +77403,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-theorem_4_0" = callPackage + "copilot-theorem_4_1" = callPackage ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core , copilot-prettyprinter, data-default, directory, libBF, mtl, panic , parameterized-utils, parsec, pretty, process, QuickCheck, random @@ -76625,8 +77412,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "4.0"; - sha256 = "149irgw76s2cfv8491ys8i1gmad23z2c5vjiklgmz0h25b49aix3"; + version = "4.1"; + sha256 = "0jki4295p9z3a2n81pvzi1bs7i75ya9jf324cw4wiqk9r1zajdb2"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -76653,8 +77440,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "4.0"; - sha256 = "00ahja1qdvnmr7ddl13b1m9l21k8qqmkr44ml2vpwb7i7l4h65z1"; + version = "4.1"; + sha256 = "0whwi2lhjvla6v9lc37wccxkq9kpsaidfkhp6ccvkf2akc9248vl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77318,6 +78105,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "country_0_2_5_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash + , byteslice, bytestring, compact, contiguous, criterion, deepseq + , hashable, primitive, primitive-unlifted, QuickCheck + , quickcheck-classes, scientific, tasty, tasty-quickcheck, text + , text-short, unordered-containers + }: + mkDerivation { + pname = "country"; + version = "0.2.5.0"; + sha256 = "195jvf322pg06jmcnibx5dz2hvzrq53893hy6cvh9qhh47axd884"; + libraryHaskellDepends = [ + aeson attoparsec base bytebuild bytehash byteslice bytestring + contiguous deepseq hashable primitive primitive-unlifted scientific + text text-short unordered-containers + ]; + testHaskellDepends = [ + base byteslice primitive QuickCheck quickcheck-classes tasty + tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ base bytehash compact criterion text ]; + description = "Country data type and functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "country-codes" = callPackage ({ mkDerivation, aeson, base, deepseq, HTF, HUnit, shakespeare , text @@ -77999,14 +78812,14 @@ self: { mainProgram = "crackNum"; }) {}; - "crackNum_3_14" = callPackage + "crackNum_3_15" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, ghc, libBF , process, sbv, tasty, tasty-golden }: mkDerivation { pname = "crackNum"; - version = "3.14"; - sha256 = "03k2inklgilnqf57h7py3h9mr0zg8wb7fagv8lb0pjxzw02c4qms"; + version = "3.15"; + sha256 = "0sljmdmyr8gxm3mkz16w5bnyqbjgcj11fgqyp5grxv2wc11p7kdz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78541,10 +79354,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.6.3.0"; - sha256 = "18lvvsgd9wwffmq00hqspjqk71njaw9ia6j5n930rpvab7i125y3"; - revision = "1"; - editedCabalFile = "1576v10909fxizrjzszfj6h8r0j3vlsxpnm5ldarihv8xmnikyb2"; + version = "1.6.4.0"; + sha256 = "0l9gxar759nskhm7gskr3j08bw8515amw6rr4n3zx3978dxg8aq6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78620,8 +79431,8 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.2.2.0"; - sha256 = "1kcy8n80kinf8ypan25q61ah99h8v9xrcm6fimp46ky0civ8c089"; + version = "0.2.3.0"; + sha256 = "1qnzgkmjlv3m6zr8l3dfnc1b5jy2fyjxb7s1qzhdcww4bsixqxfc"; libraryHaskellDepends = [ aeson base base-compat binary containers deepseq ghc-prim vector ]; @@ -78763,17 +79574,17 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, criterion, data-default-class + ({ mkDerivation, attoparsec, base, criterion, data-default , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty , tasty-hedgehog, tasty-hunit, text, time, transformers-compat }: mkDerivation { pname = "cron"; - version = "0.7.1"; - sha256 = "1q0ahnb6cxlqdq3g5i082k0aaf23f88ik1mz8066i015r406x07i"; + version = "0.7.2"; + sha256 = "11rk767k34ym2is7sxm6zgl19shb0jw3hyw53ihmjkbvh63d7s93"; libraryHaskellDepends = [ - attoparsec base data-default-class mtl mtl-compat old-locale - semigroups text time + attoparsec base data-default mtl mtl-compat old-locale semigroups + text time ]; testHaskellDepends = [ attoparsec base hedgehog semigroups tasty tasty-hedgehog @@ -79451,8 +80262,8 @@ self: { }: mkDerivation { pname = "crypto-token"; - version = "0.1.1"; - sha256 = "1x5xfrdi9y207fvk266wc2b6gj9mzvgsi6sy2zsqg6k8acf61vfc"; + version = "0.1.2"; + sha256 = "18xphlvn6wzyi6lqrvm5vic97pkcbiph1938p5l1mb22rj5215zm"; libraryHaskellDepends = [ array base bytestring crypton memory network-byte-order ]; @@ -79856,21 +80667,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton-connection_0_4_1" = callPackage + "crypton-connection_0_4_3" = callPackage ({ mkDerivation, base, basement, bytestring, containers , crypton-x509, crypton-x509-store, crypton-x509-system - , crypton-x509-validation, data-default-class, network, socks, tls + , crypton-x509-validation, data-default, network, socks, tls }: mkDerivation { pname = "crypton-connection"; - version = "0.4.1"; - sha256 = "0s1n1rqp2dmc55sr42nsw2j9k3cs7lgx90bcfi5ckq0jh3mkyy4n"; + version = "0.4.3"; + sha256 = "1q9az1bd6gykm897vmasbx1v9dfnwz4fgypya12yssjy7772b269"; libraryHaskellDepends = [ base basement bytestring containers crypton-x509 crypton-x509-store - crypton-x509-system crypton-x509-validation data-default-class - network socks tls + crypton-x509-system crypton-x509-validation data-default network + socks tls ]; - description = "Simple and easy network connections API"; + description = "Simple and easy network connection API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -79935,22 +80746,20 @@ self: { "crypton-x509-validation" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, crypton, crypton-x509, crypton-x509-store - , data-default-class, hourglass, memory, mtl, pem, tasty - , tasty-hunit + , data-default, hourglass, memory, mtl, pem, tasty, tasty-hunit }: mkDerivation { pname = "crypton-x509-validation"; - version = "1.6.12"; - sha256 = "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f"; + version = "1.6.13"; + sha256 = "1m8mri0ix09s484im2nd0xw0h1fyzmhjakvxd7q1gdqxa4jm69si"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers crypton - crypton-x509 crypton-x509-store data-default-class hourglass memory - mtl pem + crypton-x509 crypton-x509-store data-default hourglass memory mtl + pem ]; testHaskellDepends = [ asn1-encoding asn1-types base bytestring crypton crypton-x509 - crypton-x509-store data-default-class hourglass memory tasty - tasty-hunit + crypton-x509-store data-default hourglass memory tasty tasty-hunit ]; description = "X.509 Certificate and CRL validation"; license = lib.licenses.bsd3; @@ -81143,8 +81952,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.3.7"; - sha256 = "1g8afbpayw6hcbgrfzqpipp3r0657mcimlmpizdxdk5xbl2j2r03"; + version = "0.3.8"; + sha256 = "1nr3x4qym270i1ddk69964b8c11k303ayhqspykrxkpsqf83hi0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81748,21 +82557,21 @@ self: { "dahdit" = callPackage ({ mkDerivation, base, bytestring, containers, data-default - , data-sword, falsify, free, ghc-typelits-knownnat, mtl, primitive - , tasty, tasty-hunit, text, transformers, vector + , data-sword, free, ghc-typelits-knownnat, mtl, primitive + , prop-unit, text, transformers, vector }: mkDerivation { pname = "dahdit"; - version = "0.5.1"; - sha256 = "03fc6h3g6w6ymlq3g54ihkwca6jzc6xlhphxadi5xi8di0xsrbla"; + version = "0.7.0"; + sha256 = "11g5c6csgrw6jq3ijv07yq2kj4f3ylkh450gv8qs9lqlg5haiis3"; libraryHaskellDepends = [ base bytestring containers data-default data-sword free ghc-typelits-knownnat mtl primitive text transformers vector ]; testHaskellDepends = [ - base bytestring containers data-default data-sword falsify free - ghc-typelits-knownnat mtl primitive tasty tasty-hunit text - transformers vector + base bytestring containers data-default data-sword free + ghc-typelits-knownnat mtl primitive prop-unit text transformers + vector ]; description = "Binary parsing and serialization with integrated size"; license = lib.licenses.bsd3; @@ -81772,21 +82581,21 @@ self: { "dahdit-midi" = callPackage ({ mkDerivation, base, bytestring, containers, dahdit, dahdit-test - , data-sword, daytripper, directory, falsify, filepath, hashable - , nanotime, newtype, primitive, tasty, text, vector + , data-sword, daytripper, directory, filepath, hashable, nanotime + , newtype, primitive, prop-unit, text, vector }: mkDerivation { pname = "dahdit-midi"; - version = "0.5.5"; - sha256 = "082fjzfnfwydb9x638f3faggd5safwjbkaz67905xi582f01ilg9"; + version = "0.7.0"; + sha256 = "15id66nm3lknwgmmh57kfzjlg8ai7l3rlls5by56ii8a9c5x5hxg"; libraryHaskellDepends = [ base bytestring containers dahdit data-sword hashable nanotime newtype primitive text vector ]; testHaskellDepends = [ base bytestring containers dahdit dahdit-test data-sword daytripper - directory falsify filepath hashable nanotime newtype primitive - tasty text vector + directory filepath hashable nanotime newtype primitive prop-unit + text vector ]; description = "MIDI and OSC parsing/printing with dahdit"; license = lib.licenses.bsd3; @@ -81799,8 +82608,8 @@ self: { }: mkDerivation { pname = "dahdit-network"; - version = "0.5.2"; - sha256 = "0gsz67y6r02l69jakfiwd7607d6alf0bzhm9binabxqc2h9n439g"; + version = "0.7.0"; + sha256 = "07aj5hc8vgy3691q9x335b4ypxjl5m17b7qw19gkg0lxphddxx25"; libraryHaskellDepends = [ base bytestring dahdit network resourcet unliftio-core ]; @@ -81815,18 +82624,19 @@ self: { "dahdit-test" = callPackage ({ mkDerivation, base, bytestring, containers, dahdit, daytripper - , directory, falsify, tasty, text + , directory, prop-unit, text }: mkDerivation { pname = "dahdit-test"; - version = "0.5.1"; - sha256 = "105wvh7x1pcnmzfjknpfycr4r8zcddhc385y3jbgdpbhrjijh1a9"; + version = "0.7.0"; + sha256 = "0k7sy43d319n2371qsv803x4p51653bfdysjk5nyc6f68i2q7j12"; libraryHaskellDepends = [ - base bytestring containers dahdit daytripper directory falsify text + base bytestring containers dahdit daytripper directory prop-unit + text ]; testHaskellDepends = [ - base bytestring containers dahdit daytripper directory falsify - tasty text + base bytestring containers dahdit daytripper directory prop-unit + text ]; description = "Test utils for Dahdit serde"; license = lib.licenses.bsd3; @@ -81971,6 +82781,8 @@ self: { pname = "dap"; version = "0.1.0.0"; sha256 = "1iq6vd2s6qz5mmcqfg8a9a4y9i9k4v6ak4n3jl5n5mdqbrli7ipz"; + revision = "1"; + editedCabalFile = "1aapq2sv4f5lnzblplfrgxwi6x2hy0jz0h9dxi562lbxylmjvjaz"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers lifted-base monad-control mtl network network-simple stm text time @@ -82010,36 +82822,33 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, crypton-connection, cryptonite, data-default-class - , data-ordlist, directory, exceptions, fgl, filepath, FindBin - , hashable, haskeline, html, http-client-tls, http-conduit + , containers, cryptonite, data-ordlist, directory, exceptions, fgl + , filepath, FindBin, hashable, haskeline, html, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa - , safe, stm, strict-identity, system-fileio, system-filepath, tar - , temporary, terminal-size, terminfo, test-framework - , test-framework-hunit, test-framework-leancheck - , test-framework-quickcheck2, text, time, tls, transformers - , transformers-base, unix, unix-compat, utf8-string, vector - , zip-archive, zlib + , safe, stm, system-fileio, system-filepath, tar, temporary + , terminal-size, terminfo, test-framework, test-framework-hunit + , test-framework-leancheck, test-framework-quickcheck2, text, time + , tls, transformers, transformers-base, unix, unix-compat + , utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.18.3"; - sha256 = "16p6z21xiz8p3acj21wbkzr1flv5wsj17l16sa3l7gksj9idiaql"; + version = "2.18.4"; + sha256 = "0f034hnrw15i8zz160hl81sr0kja2a7ji5ygkf68yp3q5xpjgg7l"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring - conduit constraints containers crypton-connection cryptonite - data-default-class data-ordlist directory exceptions fgl filepath - hashable haskeline html http-client-tls http-conduit http-types - memory mmap mtl network network-uri old-time parsec process - regex-applicative regex-base regex-tdfa safe stm strict-identity - tar temporary terminal-size terminfo text time tls transformers - unix unix-compat utf8-string vector zip-archive zlib + conduit constraints containers cryptonite data-ordlist directory + exceptions fgl filepath hashable haskeline html http-conduit + http-types memory mmap mtl network network-uri old-time parsec + process regex-applicative regex-base regex-tdfa safe stm tar + temporary terminal-size terminfo text time tls transformers unix + unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -82535,8 +83344,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; - revision = "3"; - editedCabalFile = "136rjhg0m49d2l8z7kp46hc8q7bkipvkwnn40nv8kqkpvrgrg8d4"; + revision = "4"; + editedCabalFile = "1yr2pa9ghmlhy28dfbch7snsmab6y8vvml7ch7pvx44gil0l0h1s"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -82740,8 +83549,8 @@ self: { ({ mkDerivation, base, constraints }: mkDerivation { pname = "data-compat"; - version = "0.1.0.4"; - sha256 = "0cgm17zzfmmglnprgv91aqpm7n847qlajfz8gp7qqwjlg9xfmpy9"; + version = "0.1.0.5"; + sha256 = "0v8hgw9kcwgdwahm32a6qz04v8j0kdn9pd6vywhpf2g73v4kfdvj"; libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; license = lib.licenses.mit; @@ -82849,6 +83658,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-default-class_0_2_0_0" = callPackage + ({ mkDerivation, data-default }: + mkDerivation { + pname = "data-default-class"; + version = "0.2.0.0"; + sha256 = "1d6m12yv5vjciwbig484jrv9qpy7v762k51rpalcimhbzg231r8a"; + libraryHaskellDepends = [ data-default ]; + description = "A class for types with a default value (compatibility shim)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-extra" = callPackage ({ mkDerivation, base, data-default-class , data-default-instances-bytestring @@ -83131,18 +83952,16 @@ self: { "data-effects" = callPackage ({ mkDerivation, base, data-default, data-effects-core - , data-effects-th, lens, tasty, tasty-discover, tasty-hunit, text - , these, time + , data-effects-th, infinite-list, lens, tasty, tasty-discover + , tasty-hunit, text, these, time }: mkDerivation { pname = "data-effects"; - version = "0.2.0.0"; - sha256 = "1fmag3frj414q3anp8711l53diy603rz6sh6pl3p9bliwk8npwfs"; - revision = "1"; - editedCabalFile = "13j27hw73a8kzjf6hvz8pyj8xfv6j9bzp8y2ahd8w6ycv7kdcl10"; + version = "0.3.0.1"; + sha256 = "0xglskzbh7hfl48hx4674ci4p0k8wk9kj2gcw2skpi39pqy2qiwm"; libraryHaskellDepends = [ - base data-default data-effects-core data-effects-th lens text these - time + base data-default data-effects-core data-effects-th infinite-list + lens text these time ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83178,8 +83997,8 @@ self: { pname = "data-effects-th"; version = "0.2.0.0"; sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; - revision = "1"; - editedCabalFile = "1bi4rhb6wl5n5myp1jc5rv3s483jspqfa53dkv7xsq6chvfqhf7h"; + revision = "2"; + editedCabalFile = "1zrl8m2w1hlpdhagbhrmq2slf22yfn1am3kw8v68nh2lqp2v9b0x"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83385,6 +84204,8 @@ self: { pname = "data-fix"; version = "0.3.4"; sha256 = "0dxb2s2bxdl4fcd0kfybprz9kwsskdwshdh543lvjyh4ik8m5w4d"; + revision = "1"; + editedCabalFile = "06r6054jfaqqf8yx21m86x5bzpnkjmqrbppyf3b7h26ad1hvwy7f"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -84004,21 +84825,19 @@ self: { }) {}; "data-reify" = callPackage - ({ mkDerivation, base, base-compat, containers, hashable, hspec - , hspec-discover, unordered-containers + ({ mkDerivation, base, containers, hashable, hspec, hspec-discover + , unordered-containers }: mkDerivation { pname = "data-reify"; - version = "0.6.3"; - sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; - revision = "3"; - editedCabalFile = "0mr1926a4jniy16lsj8a3s8irxlihi0j9vnbpzggfxidxys6z93w"; + version = "0.6.4"; + sha256 = "1b2pahnsjckki3kmp4vn9sfqa1199n4hag6ikqlfvf8v2snjxlqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hashable unordered-containers ]; - testHaskellDepends = [ base base-compat hspec ]; + testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Reify a recursive data structure into an explicit graph"; license = lib.licenses.bsd3; @@ -84984,20 +85803,20 @@ self: { }) {}; "daytripper" = callPackage - ({ mkDerivation, base, bytestring, directory, falsify - , optparse-applicative, tagged, tasty, tasty-hunit + ({ mkDerivation, base, bytestring, directory, optparse-applicative + , prop-unit, tagged, tasty, tasty-hunit }: mkDerivation { pname = "daytripper"; - version = "0.3.1"; - sha256 = "1x9zjfj302fd6r378rw19a7n4jivc71bpi6c37il0w1y5951c462"; + version = "1.0.0"; + sha256 = "0mi03wgaa4pmrzmr0l5h34nl3wgzl14h825zlbpcjdm0zg0diw64"; libraryHaskellDepends = [ - base bytestring directory falsify optparse-applicative tagged tasty - tasty-hunit + base bytestring directory optparse-applicative prop-unit tagged + tasty tasty-hunit ]; testHaskellDepends = [ - base bytestring directory falsify optparse-applicative tagged tasty - tasty-hunit + base bytestring directory optparse-applicative prop-unit tagged + tasty tasty-hunit ]; description = "Helpers for round-trip tests"; license = lib.licenses.bsd3; @@ -85227,7 +86046,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_8" = callPackage + "dbus_1_3_9" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , deepseq, directory, exceptions, extra, filepath, lens, network , parsec, process, QuickCheck, random, resourcet, split, tasty @@ -85236,8 +86055,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.3.8"; - sha256 = "1vw6268w3gs7lzi3p0g1vhi930cwwb2l38w6mnv1yzsm26v6np4s"; + version = "1.3.9"; + sha256 = "0n0ajk2cyv02kfwh9zs7xg84hiyhaqnw1z5a0jc8z9c1in3p9vm0"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85255,14 +86074,18 @@ self: { }) {}; "dbus-app-launcher" = callPackage - ({ mkDerivation, base, containers, dbus, extra, unix }: + ({ mkDerivation, base, containers, dbus, extra, regex-tdfa + , shellwords, unix + }: mkDerivation { pname = "dbus-app-launcher"; - version = "0.1.0.0"; - sha256 = "142l60kz6qx9k88jdg94icfq3aa8g160d4q9g8hrvpr0360gq2dv"; + version = "0.1.1.0"; + sha256 = "0hzaif160jp16wd5x92fsdxz74flf8pq0pp91pg5hjz47z90nyqw"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base containers dbus extra unix ]; + executableHaskellDepends = [ + base containers dbus extra regex-tdfa shellwords unix + ]; description = "Simple app launcher for D-Bus"; license = lib.licenses.mit; mainProgram = "dbus-app-launcher"; @@ -85900,24 +86723,28 @@ self: { }: mkDerivation { pname = "debruijn"; - version = "0.1"; - sha256 = "1bpy918flzmhwiwmz5ivjgqn2i3hidzcgc31w8d2br88p0clixv4"; + version = "0.2"; + sha256 = "1j2bwlmjl65zydjhgv5v2cgvaw8p9vvsg3qd3vpbd8c0r07v5np2"; libraryHaskellDepends = [ base deepseq fin skew-list some transformers ]; description = "de Bruijn indices and levels"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "debruijn-safe" = callPackage ({ mkDerivation, base, deepseq, fin, some }: mkDerivation { pname = "debruijn-safe"; - version = "0.1"; - sha256 = "17db3640y31isalrw4hpf9z7wyjysb7gyig8d2mg1b6ycr9dy223"; + version = "0.2"; + sha256 = "0jxczhcsppcmfyzgzg1d3r5zw60kb3zi0jcb1rrrb4grcc495f3b"; libraryHaskellDepends = [ base deepseq fin some ]; description = "de Bruijn indices and levels"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "debug" = callPackage @@ -86076,6 +86903,22 @@ self: { broken = true; }) {}; + "debuggable" = callPackage + ({ mkDerivation, async, base, containers, exceptions, hashable + , optparse-applicative, temporary, unordered-containers + }: + mkDerivation { + pname = "debuggable"; + version = "0.1.0"; + sha256 = "0wr0s3l427wd20bq93dppdbxcr3pda63yc1h08cppm10j1dfhlpx"; + libraryHaskellDepends = [ + base containers exceptions hashable temporary unordered-containers + ]; + testHaskellDepends = [ async base optparse-applicative ]; + description = "Utilities for making your applications more debuggable"; + license = lib.licenses.bsd3; + }) {}; + "debugger-hs" = callPackage ({ mkDerivation, base, dlist, hspec, mtl, neat-interpolation, text }: @@ -86183,8 +87026,8 @@ self: { pname = "decision-diagrams"; version = "0.2.0.0"; sha256 = "0l03mwig95h300rn1cfhd5ahwrlap6zsw09lwmkx6wkw6rjf4a5s"; - revision = "3"; - editedCabalFile = "11gb1dm0rladnjr8y2w15pba8dp4hr4kb2gshikq7xiiffgx70lz"; + revision = "4"; + editedCabalFile = "0xlv7zw25jg9na0jy7ic2ni97j38z7vhn89vz44v8k6b93jd0wx9"; libraryHaskellDepends = [ base containers hashable hashtables intern mwc-random primitive random reflection unordered-containers vector @@ -86274,14 +87117,19 @@ self: { }) {}; "deep-map" = callPackage - ({ mkDerivation, base, containers, indexed-traversable }: + ({ mkDerivation, base, containers, indexed-traversable, witherable + }: mkDerivation { pname = "deep-map"; - version = "0.2.0.1"; - sha256 = "1qawlz663k1n20wk0qx47mldyydf8glgp8m4b8r2pxhyh99yqf0j"; - libraryHaskellDepends = [ base containers indexed-traversable ]; + version = "0.3.2"; + sha256 = "02bg8hxjx8hpkc8n2z4jkj39na6s9mz85wmynn6qanb7dvpdllss"; + libraryHaskellDepends = [ + base containers indexed-traversable witherable + ]; description = "Deeply-nested, multiple key type maps"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "deep-transformations" = callPackage @@ -86732,6 +87580,23 @@ self: { license = lib.licenses.mit; }) {}; + "dejafu_2_4_0_6" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.4.0.6"; + sha256 = "1bmfc6bryhxdbv9k313f0hbdqf2zasivcj3b1zdwqajv34mwdzbm"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -86920,6 +87785,31 @@ self: { mainProgram = "delta-h"; }) {}; + "deltaq" = callPackage + ({ mkDerivation, base, bytestring, cassava, Chart, criterion + , deepseq, hspec, hspec-discover, hvega, lattices + , optparse-applicative, probability-polynomial, QuickCheck + , statistics, vector + }: + mkDerivation { + pname = "deltaq"; + version = "1.0.0.0"; + sha256 = "00zpvwxar13rq84li7j21ycapdnyx128cs2yqvn6hwnrr8w25w9d"; + libraryHaskellDepends = [ + base Chart deepseq lattices probability-polynomial + ]; + testHaskellDepends = [ + base hspec probability-polynomial QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring cassava criterion deepseq hvega + optparse-applicative statistics vector + ]; + description = "Framework for ∆Q System Development"; + license = lib.licenses.bsd3; + }) {}; + "delude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -87336,8 +88226,8 @@ self: { pname = "dependent-sum-template"; version = "0.2.0.1"; sha256 = "0rba7jf9hpn73gcqqkxvfk8j5mifb49glp6gjc8k93pg78zy7yqf"; - revision = "1"; - editedCabalFile = "16z72slamnghhqik23qvkyp2v5hv5w9wqvi0n8h0640sp1s80r4q"; + revision = "2"; + editedCabalFile = "0nqaxbqw4qlwf03mk59sgkakn14krb5l2clrd392qilga1a3srx9"; libraryHaskellDepends = [ base containers mtl some template-haskell th-abstraction ]; @@ -87585,8 +88475,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.4"; - sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; + version = "0.1.0.0"; + sha256 = "1hc5fgsc0yzidrnhwrlhvmaw062yv1v6vg5wl4l597cd74316mcl"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -87750,10 +88640,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.9"; - sha256 = "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0"; - revision = "1"; - editedCabalFile = "14iqkk7vs0lb0sgq159z0xw95pa87r60i1f4m17gfh2gbbddcywm"; + version = "0.2.10"; + sha256 = "0xrny17zfsfjrl6042na32q7msm939p3ns6x7iw47xc21an55yrs"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -87783,6 +88671,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6_7" = callPackage + ({ mkDerivation, base, base-orphans, containers, ghc-boot-th + , ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.6.7"; + sha256 = "1pzmqwjfd4j5bbcxl8xcgaxilmsfvcwak47rqkakn87n2c85zi6x"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-orphans hspec QuickCheck tagged template-haskell + transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-openapi3" = callPackage ({ mkDerivation, aeson, base, deriving-aeson, lens, openapi3, text }: @@ -87997,23 +88909,23 @@ self: { }) {}; "desktop-portal" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-default-class, dbus, directory, filepath, hspec - , hspec-discover, hspec-expectations, modern-uri, network, process + ({ mkDerivation, base, binary, bytestring, containers, data-default + , dbus, directory, filepath, hspec, hspec-discover + , hspec-expectations, modern-uri, network, os-string, process , random, temporary, text, unix }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.2"; - sha256 = "04z1d3gqcd0qvrvfhiv51sdhra5m39dq5jvp8hsrw2k32mkdixn9"; + version = "0.8.0.1"; + sha256 = "09rr3ffkg5960dy909x30qlayzcm0ifzy0w64gvsnz3ybkq4c5j9"; libraryHaskellDepends = [ - base binary bytestring containers data-default-class dbus directory - filepath modern-uri network random text unix + base binary bytestring containers data-default dbus directory + filepath modern-uri network os-string random text unix ]; testHaskellDepends = [ - base binary bytestring containers data-default-class dbus directory - filepath hspec hspec-expectations modern-uri network process random - temporary text unix + base binary bytestring containers data-default dbus directory + filepath hspec hspec-expectations modern-uri network os-string + process random temporary text unix ]; testToolDepends = [ hspec-discover ]; description = "Desktop Portal"; @@ -88377,8 +89289,8 @@ self: { pname = "dhall"; version = "1.42.1"; sha256 = "0n4773s7l9sfqi00fnh4h92mpifbh0m6vsvpghg834c0jx2gm36f"; - revision = "1"; - editedCabalFile = "04q42qhfc346ml0vxrxwcxrwn0j4wrbbi8ll17ml2pkgr28krdnh"; + revision = "2"; + editedCabalFile = "0j29l5qbr72bcxlid28sq3wpxy481xlp0pknlna7wv13vfi8a9v4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88653,8 +89565,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.3"; sha256 = "1vcdjsqd0falcx48fa58qilnwh70h6cinxbkh2rfmlhvfgmramc8"; - revision = "1"; - editedCabalFile = "07x2q58dzr7qn116rx12wpi3jsgz3f5rpxmilk0x1zj1jiwznyxg"; + revision = "2"; + editedCabalFile = "15mwpjg7axf7zmyf889675r61x754ygiy0nvf3g5km0i8a3s4203"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88916,8 +89828,8 @@ self: { pname = "dhall-yaml"; version = "1.2.12"; sha256 = "1sh802maai9vxfrjd0w4k9cv4pklhkxid1s5xdbagywcaqdhk272"; - revision = "3"; - editedCabalFile = "05dl461p5acqn9mlw08mvk3vspgk79k34v6m1wag0g7f3b34c5w4"; + revision = "4"; + editedCabalFile = "0l874s5q86dzy4q7pwjsdms53lckjamiq1wgll8sg6qifsjspmll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89297,6 +90209,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-cairo_1_4_3" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, colour, containers + , data-default, diagrams-core, diagrams-lib, filepath, hashable + , JuicyPixels, lens, mtl, optparse-applicative, pango, split + , statestack, transformers, unix, vector + }: + mkDerivation { + pname = "diagrams-cairo"; + version = "1.4.3"; + sha256 = "0irj7jigi9dfprjilndyx0kwg7vjpbhrsxhlsqc8n1sy1b4s2aha"; + libraryHaskellDepends = [ + array base bytestring cairo colour containers data-default + diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl + optparse-applicative pango split statestack transformers unix + vector + ]; + description = "Cairo backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-canvas" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -89317,6 +90250,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-canvas_1_4_2" = callPackage + ({ mkDerivation, base, blank-canvas, cmdargs, containers + , data-default, diagrams-core, diagrams-lib, lens, mtl + , NumInstances, optparse-applicative, statestack, text + }: + mkDerivation { + pname = "diagrams-canvas"; + version = "1.4.2"; + sha256 = "0ns1xmgcjqig7qld7r77rbcrk779cmzj7xfqj6a7sbdci3in2dgm"; + libraryHaskellDepends = [ + base blank-canvas cmdargs containers data-default diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative statestack + text + ]; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core @@ -89345,6 +90297,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_6" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, diagrams-core, diagrams-lib + , diagrams-solve, force-layout, hashable, HUnit, lens, linear + , mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat, parsec + , QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.6"; + sha256 = "1x5z361xmqfa503brmf0zwyq3lldm9kgixx90v14s4dsz52my46k"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + diagrams-core diagrams-lib diagrams-solve force-layout hashable + lens linear mfsolve MonadRandom monoid-extras mtl mtl-compat parsec + random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "Collection of user contributions to diagrams EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -89514,6 +90493,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-input_0_1_4" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , blaze-markup, bytestring, colour, conduit, conduit-extra + , containers, css-text, data-default, diagrams-core, diagrams-lib + , digits, either, JuicyPixels, linear, resourcet, semigroups, split + , system-filepath, text, transformers, unordered-containers, vector + , xml-conduit, xml-types + }: + mkDerivation { + pname = "diagrams-input"; + version = "0.1.4"; + sha256 = "0xmywrx8mc12jzynym9d8aw026agwphygf6n4jmd1mvw9vs0270d"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder blaze-markup + bytestring colour conduit conduit-extra containers css-text + data-default diagrams-core diagrams-lib digits either JuicyPixels + linear resourcet semigroups split system-filepath text transformers + unordered-containers vector xml-conduit xml-types + ]; + description = "Parse raster and SVG files for diagrams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-lib" = callPackage ({ mkDerivation, active, adjunctions, array, base, bytestring , cereal, colour, containers, criterion, data-default-class @@ -89547,6 +90550,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-lib_1_4_7" = callPackage + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default, deepseq + , diagrams-core, diagrams-solve, directory, distributive, dual-tree + , exceptions, fail, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , QuickCheck, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.4.7"; + sha256 = "164czhsn149981glqyzvixv2q8hwd15klav9djhvbssw6r2lsfj2"; + libraryHaskellDepends = [ + active adjunctions array base bytestring cereal colour containers + data-default diagrams-core diagrams-solve directory distributive + dual-tree exceptions fail filepath fingertree fsnotify hashable + intervals JuicyPixels lens linear monoid-extras mtl + optparse-applicative process profunctors semigroups tagged text + transformers unordered-containers + ]; + testHaskellDepends = [ + base deepseq diagrams-solve distributive lens numeric-extras + QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; + description = "Embedded domain-specific language for declarative graphics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-pandoc" = callPackage ({ mkDerivation, base, bytestring, diagrams-builder, diagrams-cairo , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath @@ -89637,6 +90672,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-postscript_1_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , diagrams-core, diagrams-lib, hashable, lens, monoid-extras, mtl + , semigroups, split, statestack + }: + mkDerivation { + pname = "diagrams-postscript"; + version = "1.5.2"; + sha256 = "08kqhnd5r60kisjraypwjfcri1v4f32rf14js413871pgic4rhy5"; + libraryHaskellDepends = [ + base bytestring containers data-default diagrams-core diagrams-lib + hashable lens monoid-extras mtl semigroups split statestack + ]; + description = "Postscript backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-qrcode" = callPackage ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib }: @@ -89675,6 +90728,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity + , hashable, JuicyPixels, lens, mtl, optparse-applicative + , Rasterific + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.4.3"; + sha256 = "1m7d9mjyydzb74vq1w3irazx334ygqvjhcql3akw62c9f6kckdq8"; + libraryHaskellDepends = [ + base bytestring containers data-default diagrams-core diagrams-lib + file-embed filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific + ]; + testHaskellDepends = [ base diagrams-core diagrams-lib ]; + description = "Rasterific backend for diagrams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-reflex" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom @@ -90047,8 +91121,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; - revision = "2"; - editedCabalFile = "1wqbrgp1dxvcwlc04l4rx9g2pkjl1spvrlhkfrzm5xkra33fsnqy"; + revision = "3"; + editedCabalFile = "0msy6gqch9nz5dr1hddwvyq57kf0l8c0dybsl6d2f3109f60rsrn"; libraryHaskellDepends = [ base fingertree show-combinators ]; description = "Map file locations across diffs"; license = lib.licenses.mit; @@ -90597,16 +91671,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "dimensional_1_6" = callPackage + "dimensional_1_6_1" = callPackage ({ mkDerivation, base, criterion, deepseq, exact-pi, hspec , hspec-discover, ieee754, numtype-dk, QuickCheck, vector }: mkDerivation { pname = "dimensional"; - version = "1.6"; - sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; - revision = "1"; - editedCabalFile = "0g51fw0k86jr0nlvriiprw5zpjqkifxc16s18h1h240y2v0cbgq0"; + version = "1.6.1"; + sha256 = "1alys6kxhs0cbadk0sgs0k5whyn62klpf08b5n1kny7qpq3rhaq4"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90754,8 +91826,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.15"; - sha256 = "03wvdphxc2csxs7h56lg5zz9cp15bv5ac3y1wp9z7q3zkmwla68c"; + version = "0.1.16"; + sha256 = "1wh0vw9bbj148lr3idwx1xdwprx9685nppk2qglsy2nwmli893sf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90988,6 +92060,8 @@ self: { pname = "directory"; version = "1.3.9.0"; sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; + revision = "1"; + editedCabalFile = "05xr3df321hb7rnsbad8bgm1jqi7bzpmi54mja9xg2vknxxi7414"; libraryHaskellDepends = [ base file-io filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -91076,15 +92150,17 @@ self: { broken = true; }) {}; - "directory-ospath-streaming_0_1_0_2" = callPackage - ({ mkDerivation, base, directory, filepath, os-string, random - , tasty, tasty-hunit, unix + "directory-ospath-streaming_0_2_1" = callPackage + ({ mkDerivation, atomic-counter, base, deepseq, directory, filepath + , os-string, random, tasty, tasty-hunit, unix }: mkDerivation { pname = "directory-ospath-streaming"; - version = "0.1.0.2"; - sha256 = "17a3sqw3sw70bxdw91vq17pbjjdymnivn9gkfvclr5gicvw30d6k"; - libraryHaskellDepends = [ base filepath os-string unix ]; + version = "0.2.1"; + sha256 = "01jp33m4fq54v3yr95nigad99kznnh23hx3p1yxz6mj2b4q63ia5"; + libraryHaskellDepends = [ + atomic-counter base deepseq filepath os-string unix + ]; testHaskellDepends = [ base directory filepath os-string random tasty tasty-hunit unix ]; @@ -91325,8 +92401,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.17.0"; - sha256 = "0xmfrv50h07sz3hcv96j6nih00gmd0jk6w4d8bprnds2hdzjxsj0"; + version = "1.17.1"; + sha256 = "1lw1n8m297ad0rcbn48ysg85l35sg5bh3gwbnm2698cd051b4yad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91863,16 +92939,14 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, containers , data-accessor, deepseq, distributed-process , distributed-process-systest, exceptions, fingertree, hashable - , mtl, network, network-transport, network-transport-tcp, rematch - , stm, test-framework, test-framework-hunit, time, transformers + , mtl, network, network-transport, network-transport-tcp, stm + , test-framework, test-framework-hunit, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.8"; - sha256 = "0zgdkgsbi0909galmkzg8iw7yhf0qji32aijjdsrn3gfy43hnr4c"; - revision = "1"; - editedCabalFile = "161vvls4000gg4jh5yr2rc11m4zpbphws12v35hhnd4gn4jh2jrn"; + version = "0.2.10"; + sha256 = "1j0rscip4gyr3aw6br07w3wx5wvm8fd1mgknknhf77zx7vc9cspk"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process exceptions fingertree hashable mtl stm time transformers @@ -91881,8 +92955,8 @@ self: { testHaskellDepends = [ ansi-terminal base binary deepseq distributed-process distributed-process-systest exceptions network network-transport - network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + network-transport-tcp stm test-framework test-framework-hunit + transformers ]; description = "Cloud Haskell Async API"; license = lib.licenses.bsd3; @@ -91917,16 +92991,13 @@ self: { , distributed-process, distributed-process-async , distributed-process-extras, distributed-process-systest , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, rematch, stm - , test-framework, test-framework-hunit, time, transformers - , unordered-containers + , network-transport, network-transport-tcp, stm, test-framework + , test-framework-hunit, time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.2.6.0"; - sha256 = "0mb0awlq60hgjmm6bjzvd86a5kb919q8rx8mbl155q2gbvwvpj4b"; - revision = "1"; - editedCabalFile = "0mf4zvl6k4h5alcvryiarr9wrlqc3w4rlaxdxk54srdg34cmvn87"; + version = "0.2.7.1"; + sha256 = "1kr4l88q4mh8pv68rjj5nnc5ccivq175vrzk6s6dllyn3hs7wxfi"; libraryHaskellDepends = [ base binary containers deepseq distributed-process distributed-process-async distributed-process-extras exceptions @@ -91936,7 +93007,7 @@ self: { ansi-terminal base binary containers deepseq distributed-process distributed-process-async distributed-process-extras distributed-process-systest exceptions fingertree ghc-prim HUnit - mtl network network-transport network-transport-tcp rematch stm + mtl network network-transport network-transport-tcp stm test-framework test-framework-hunit transformers ]; description = "The Cloud Haskell Application Platform"; @@ -91967,16 +93038,14 @@ self: { , distributed-process-supervisor, distributed-process-systest , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl , network, network-transport, network-transport-tcp, QuickCheck - , rematch, stm, test-framework, test-framework-hunit + , stm, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-execution"; - version = "0.1.3.0"; - sha256 = "0cr29ca19yfxhq42l5iyh6q29ymdl40cw2mxzms3mfw6p1qgn16z"; - revision = "1"; - editedCabalFile = "04lwlb6iflh0l12ghr8hza7yjxg0kqq58k9250h20gh6xacgdrz4"; + version = "0.1.4.1"; + sha256 = "0n1ylgwb5yvli0shpckfvxf9nhb5cf21c1kh0r21wh49k8v5ppvg"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -91988,7 +93057,7 @@ self: { deepseq distributed-process distributed-process-extras distributed-process-systest distributed-static fingertree ghc-prim hashable HUnit mtl network network-transport network-transport-tcp - QuickCheck rematch stm test-framework test-framework-hunit + QuickCheck stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; description = "Execution Framework for The Cloud Haskell Application Platform"; @@ -92001,17 +93070,14 @@ self: { , containers, data-accessor, deepseq, distributed-process , distributed-process-systest, distributed-static, exceptions , fingertree, ghc-prim, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, QuickCheck, rematch - , stm, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers - , unordered-containers + , network-transport, network-transport-tcp, QuickCheck, stm + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.6"; - sha256 = "12xghaimlkw9kh2ha9mr722fmikf9rscxkp92acagzxsw9pyspqz"; - revision = "1"; - editedCabalFile = "0a4ayr8cx35r491a2m2yapg7sd9890jx1x1gdaghv6an6p33qjc9"; + version = "0.3.8"; + sha256 = "076lsgdh5dfs6c7rfbs83c1cpxcy9i410i8knp5b82cxbbi8c3xy"; libraryHaskellDepends = [ base binary containers deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers @@ -92020,7 +93086,7 @@ self: { ansi-terminal base binary bytestring containers data-accessor deepseq distributed-process distributed-process-systest distributed-static fingertree ghc-prim hashable HUnit mtl network - network-transport network-transport-tcp QuickCheck rematch stm + network-transport network-transport-tcp QuickCheck stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; @@ -92215,33 +93281,28 @@ self: { }) {}; "distributed-process-supervisor" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, bytestring - , containers, data-accessor, deepseq, distributed-process + ({ mkDerivation, base, binary, bytestring, containers + , data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras - , distributed-static, exceptions, fingertree, ghc-prim, hashable - , HUnit, mtl, network, network-transport, network-transport-tcp - , random, rematch, stm, test-framework, test-framework-hunit, time - , transformers, unordered-containers + , distributed-static, exceptions, hashable, HUnit + , network-transport, network-transport-tcp, random, stm + , test-framework, test-framework-hunit, time }: mkDerivation { pname = "distributed-process-supervisor"; - version = "0.2.2"; - sha256 = "015pk8px0g3l1h1bj59ns8nlwmrirbqmwq7l9mqdqp05vpjr4npm"; - revision = "1"; - editedCabalFile = "0srf56yl1fr67y0zvd3mqn50qbi7rj2n93pf2zlgnpmllgq4ww3s"; + version = "0.2.3"; + sha256 = "0138kp1xhzhwhy13hx537hrsvckqy8v2jbicwzgkgcj67sgivbvw"; libraryHaskellDepends = [ - base binary bytestring containers data-accessor deepseq - distributed-process distributed-process-client-server - distributed-process-extras distributed-static exceptions fingertree - hashable mtl stm time transformers unordered-containers + base binary containers data-accessor deepseq distributed-process + distributed-process-client-server distributed-process-extras + distributed-static exceptions hashable time ]; testHaskellDepends = [ - ansi-terminal base binary bytestring containers data-accessor - deepseq distributed-process distributed-process-client-server - distributed-process-extras distributed-static exceptions fingertree - ghc-prim hashable HUnit mtl network network-transport - network-transport-tcp random rematch stm test-framework - test-framework-hunit time transformers unordered-containers + base binary bytestring deepseq distributed-process + distributed-process-client-server distributed-process-extras + distributed-static exceptions HUnit network-transport + network-transport-tcp random stm test-framework + test-framework-hunit ]; description = "Supervisors for The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; @@ -92251,17 +93312,17 @@ self: { "distributed-process-systest" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , distributed-process, distributed-static, exceptions, HUnit - , network, network-transport, random, rematch, stm, test-framework + , network, network-transport, random, stm, test-framework , test-framework-hunit }: mkDerivation { pname = "distributed-process-systest"; - version = "0.3.2"; - sha256 = "04n6i81vgfalmhlwqb6pi20c62zrcymrpmj2n1v0i4qr9f7v2in8"; + version = "0.4.1"; + sha256 = "1jqjqkdwjq3jvjqgpdrx4v5f8p09kigvhk3c8359na59cv9a8dwj"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static exceptions HUnit network network-transport - random rematch stm test-framework test-framework-hunit + random stm test-framework test-framework-hunit ]; description = "Cloud Haskell Test Support"; license = lib.licenses.bsd3; @@ -92309,16 +93370,16 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, bytestring , distributed-process, distributed-static, exceptions, HUnit , network, network-transport, network-transport-inmemory, random - , rematch, stm, test-framework, test-framework-hunit + , setenv, stm, test-framework, test-framework-hunit }: mkDerivation { pname = "distributed-process-tests"; - version = "0.5.0"; - sha256 = "01rpq0hgmvx7703xdx8x0ycfkbj7bpp3yqfxgzm8xy20d98cf9z7"; + version = "0.5.1"; + sha256 = "0mp4a51555sjx4nakyv0cxc5srbhx5av1697n9gs28n2wzmm93q0"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static exceptions HUnit network network-transport - random rematch stm test-framework test-framework-hunit + random setenv stm test-framework test-framework-hunit ]; testHaskellDepends = [ base network network-transport network-transport-inmemory @@ -92397,8 +93458,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.7.1"; - sha256 = "19jzsqva4bnnjyq0zgqmqrvlgb6x3jxjqg398kwzk5syrxbap9nl"; + version = "1.7.1.1"; + sha256 = "0zh6qgr9mksh96bp9x1k8hdp2yzvk11bcszswnfvfnpz17nkdang"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens @@ -92682,7 +93743,7 @@ self: { mainProgram = "dl-fedora"; }) {}; - "dl-fedora_1_2" = callPackage + "dl-fedora_1_2_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra , filepath, http-client, http-client-tls, http-directory , http-types, optparse-applicative, regex-posix, simple-cmd @@ -92690,8 +93751,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "1.2"; - sha256 = "16zbqvcxn1p663mhnwgcf01nxsxl4nppw5sahmfy3jg8is4wibsk"; + version = "1.2.1"; + sha256 = "1pd6wzr9nsvplb200c2bk8gyhv89lcgc2df86rfzklb6z68dqy7z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93162,23 +94223,23 @@ self: { }) {}; "dobutokO2" = callPackage - ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 - , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process - , uniqueness-periods, vector + ({ mkDerivation, aftovolio, base, bytestring, directory, end-of-exe + , mmsyn2-array, mmsyn7l, mmsyn7ukr-array, mmsyn7ukr-common, process + , vector }: mkDerivation { pname = "dobutokO2"; - version = "0.43.0.0"; - sha256 = "0f17ff77m16p951laijqf5w4pfw4pgc6x2ha13472h62dzg8gm2f"; + version = "0.44.1.0"; + sha256 = "1ggk53mzi1dmgr5yijsz9hbnaqjxbajzksbpvrpfb5d8s5mnw77p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process uniqueness-periods vector + aftovolio base bytestring directory end-of-exe mmsyn2-array mmsyn7l + mmsyn7ukr-array mmsyn7ukr-common process vector ]; executableHaskellDepends = [ - base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process uniqueness-periods vector + aftovolio base bytestring directory end-of-exe mmsyn2-array mmsyn7l + mmsyn7ukr-array mmsyn7ukr-common process vector ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; @@ -93588,6 +94649,8 @@ self: { pname = "doctest"; version = "0.23.0"; sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; + revision = "1"; + editedCabalFile = "1n9y3j4z15jf8xfi8v8pjd33b1z2csswzslqqpaa1cwazgv6f342"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93734,8 +94797,8 @@ self: { pname = "doctest-parallel"; version = "0.3.1.1"; sha256 = "1xpk020024vsqh27sp225hx50i1hn5fkhxiyww6wqnhrkxypjkwa"; - revision = "1"; - editedCabalFile = "1l2lzi4iv4d2xx5ry3vib6f0582dy1cia4cni2yfk3h2gywmxa2m"; + revision = "2"; + editedCabalFile = "1s9dibzwnl281ggp507gj1d0h26jczr537wlcr5ks5axwfb0262c"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -94500,8 +95563,8 @@ self: { }: mkDerivation { pname = "dotparse"; - version = "0.1.1.0"; - sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; + version = "0.1.2.0"; + sha256 = "1h490sn42n8w4n0br6f5rca103pxhcrn6r1asdiyhgid9pnhfh8r"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate @@ -95896,16 +96959,17 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, criterion, filepath, MonadRandom - , simple-affine-space, tasty, tasty-hunit, time, transformers - , transformers-base + ({ mkDerivation, base, criterion, filepath, list-transformer + , MonadRandom, simple-affine-space, tasty, tasty-hunit, time + , transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.13.2"; - sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; + version = "0.14.0"; + sha256 = "1iss2iq5wbys06vnwzd37frhcqlhva1b6krac4wbc7l5b0dirvr3"; libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base + base list-transformer MonadRandom simple-affine-space transformers + transformers-base ]; testHaskellDepends = [ base tasty tasty-hunit transformers ]; benchmarkHaskellDepends = [ base criterion filepath time ]; @@ -95934,8 +96998,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.2"; - sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; + version = "0.14.0"; + sha256 = "1z4gyjhvlcky9gg7az01i955c585qh15w4bm74l9r8zjd67b8xyc"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -96195,15 +97259,15 @@ self: { }) {}; "dwergaz" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, pretty }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.6"; - sha256 = "0cm4jb40iflg8vbnaplp2qbzhjdm53zfkigh0jgml5jjf1yzvc8p"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.1"; + sha256 = "1l2a52gg8z5appajr9p2pci66vrj6zlm90s079xklbhig2fgckmb"; + libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; - license = lib.licenses.bsd3; + license = lib.licenses.isc; }) {}; "dx9base" = callPackage @@ -97456,16 +98520,16 @@ self: { }) {}; "ede" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , comonad, directory, filepath, free, lens, mtl - , optparse-applicative, parsers, prettyprinter + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bifunctors, bytestring, comonad, directory, filepath, free, lens + , mtl, optparse-applicative, parsers, prettyprinter , prettyprinter-ansi-terminal, scientific, tasty, tasty-golden , text, text-manipulate, trifecta, unordered-containers, vector }: mkDerivation { pname = "ede"; - version = "0.3.3.0"; - sha256 = "0hc7jq3dfrwl87rlf0yaxv44dni95a0lc5ccs6ldr6svfwx5h7qg"; + version = "0.3.4.0"; + sha256 = "1hmckah3wmg2yhz7xjgzj8qab87pv9ffp9d5srg1941n50k96wci"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97475,8 +98539,9 @@ self: { text-manipulate trifecta unordered-containers vector ]; executableHaskellDepends = [ - aeson attoparsec base bytestring optparse-applicative prettyprinter - prettyprinter-ansi-terminal text unordered-containers + aeson attoparsec attoparsec-aeson base bytestring + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + unordered-containers ]; testHaskellDepends = [ aeson base bifunctors bytestring directory filepath tasty @@ -97875,7 +98940,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful_2_5_0_0" = callPackage + "effectful_2_5_1_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , effectful-core, exceptions, lifted-base, primitive, process , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench @@ -97883,8 +98948,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.5.0.0"; - sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; + version = "2.5.1.0"; + sha256 = "040figskafk9b8gwvphhq1s5mdq2p6fmrwd5yipl36vpdmc350fy"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm strict-mutable-base time unliftio @@ -97917,15 +98982,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-core_2_5_0_0" = callPackage + "effectful-core_2_5_1_0" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions , monad-control, primitive, strict-mutable-base, transformers-base , unliftio-core }: mkDerivation { pname = "effectful-core"; - version = "2.5.0.0"; - sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; + version = "2.5.1.0"; + sha256 = "1mn2f6kv8vnccsdq20fhb4q7xiqh5w0v9bp72ianpyyjyvljbi3a"; libraryHaskellDepends = [ base containers deepseq exceptions monad-control primitive strict-mutable-base transformers-base unliftio-core @@ -97953,6 +99018,8 @@ self: { pname = "effectful-plugin"; version = "1.1.0.4"; sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; + revision = "1"; + editedCabalFile = "1d1ih6q1fapizqw2gzm0jvyhlwgni1sffvghhmcw2dhdbbagmr4g"; libraryHaskellDepends = [ base containers effectful-core ghc ]; testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; @@ -98000,6 +99067,8 @@ self: { pname = "effectful-th"; version = "1.0.0.3"; sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; + revision = "1"; + editedCabalFile = "02p2pb43znjrmwrrpgrm6aflli1dg27ig6kbnd5j5kqab8nhbcbb"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98010,6 +99079,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "effectful-zoo" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, effectful + , effectful-core, effectful-plugin, generic-lens, HUnit, hw-prelude + , microlens, resourcet, resourcet-effectful, tasty, tasty-hedgehog + , text, time, transformers, yaml + }: + mkDerivation { + pname = "effectful-zoo"; + version = "0.0.1.0"; + sha256 = "0jfjydnmb68mqm4vqvnha6yar8064crbp50ld31f21w2vxxz9i82"; + isLibrary = false; + isExecutable = false; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring effectful effectful-core + effectful-plugin generic-lens HUnit hw-prelude microlens resourcet + resourcet-effectful tasty tasty-hedgehog text time transformers + yaml + ]; + testHaskellDepends = [ effectful-core hw-prelude tasty ]; + doHaddock = false; + description = "Effectful effects for testing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -98530,10 +99625,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.1.0"; - sha256 = "03dgsgf67clk4wqrk69jqfh0ap406k0hgz257j0f5kixpws42ahp"; - revision = "1"; - editedCabalFile = "0frwz3jyxj0laaanzq39p74lzgq6cjxzhky51fkwa63qmlv5qfda"; + version = "0.4.1.1"; + sha256 = "19dv4rcdbdahx7kwv1qfxwpifqx3z5psl1kvrwy6ic34x8qfk59c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -98600,17 +99693,13 @@ self: { }) {}; "ekg-core" = callPackage - ({ mkDerivation, base, containers, ghc-prim, text - , unordered-containers - }: + ({ mkDerivation, base, containers, text, unordered-containers }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.7"; - sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; - revision = "4"; - editedCabalFile = "1fzjwckb6h6m5n1k9kj63fy2wpjn1mz9xajiri4aqyzlg1wv619c"; + version = "0.1.1.8"; + sha256 = "028c3g1fz0rfxpfn98wxxmklnxx3szwvjxl9n9ls2w011vqslvia"; libraryHaskellDepends = [ - base containers ghc-prim text unordered-containers + base containers text unordered-containers ]; benchmarkHaskellDepends = [ base ]; description = "Tracking of system metrics"; @@ -98675,10 +99764,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.1.0"; - sha256 = "0wwzv2hfznd19385imajcarj0c42c3zczg3hlh39afy5k71hgvpp"; - revision = "1"; - editedCabalFile = "0zwmllpmczf9h6y8fagzinxin321z0fyxiyxlyw191i8zp57m579"; + version = "0.1.1.1"; + sha256 = "1mngxy3zhrgfpzi060l4v6x65la7vplbd5z04cvna2m759cn5q2i"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -98772,8 +99859,8 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.6.0"; - sha256 = "19d7bydhc1ghcadip8mw3bshj05xvrc44z3p6fxsvf498zdcxgi9"; + version = "0.2.6.1"; + sha256 = "10svmfns5s3xa4j5a295zdaxn56scmplgch8avraimf3y10spd98"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -99588,6 +100675,26 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.8.0.0"; + sha256 = "13w6bxh16fw1shmcc73xlilsq2lyfpf6049mbm9xhrxb0b8az4l5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "elynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -99610,6 +100717,29 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-markov_0_8_0_0" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, random, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.8.0.0"; + sha256 = "1j9k751zz6fg84pymcrwa5ica7d2rnmxb0512a9gqxdjsfzynmaf"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random random statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -99623,6 +100753,20 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-nexus_0_8_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.8.0.0"; + sha256 = "0074273y4v2xlk62ncayhfmhm0x6hqkyqvisdzjd1i0bm4cbqdvd"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, parallel, primitive, random, vector @@ -99644,6 +100788,28 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-seq_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, parallel, primitive, random, vector + , vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.8.0.0"; + sha256 = "10g7f3jdx4jcggcb4qrw98nac08f7fqzdg0445h0wiiilpykw0kk"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices parallel + primitive random vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, directory, hmatrix @@ -99664,6 +100830,27 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-tools_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, directory, hmatrix + , optparse-applicative, random, template-haskell, time + , transformers, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.8.0.0"; + sha256 = "02fysd2gljnj14mk93mnrfxdx7cxlalvzmwckwnqi3d2a1d5ddc4"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 directory hmatrix optparse-applicative random + template-haskell time transformers zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq @@ -99836,6 +101023,7 @@ self: { description = "Sending eMail in Haskell made easy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "email-header" = callPackage @@ -100302,8 +101490,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.9"; - sha256 = "0czqdh5bkbp1hy1kwhhmiqml5fr4n6iv0bk84slj6ym9ryrjdrf8"; + version = "0.8.10"; + sha256 = "0ccysrrpdg97g6ihlk0dh57nja7y3lf4n6ygkz1rff5r2r0z6v80"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -100314,8 +101502,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck ]; description = "A library for various character encodings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "encoding-io" = callPackage @@ -101043,6 +102229,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "envy_2_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; + version = "2.1.4.0"; + sha256 = "1gd975m8vwgvvgfa6q9gsq5b517zg0wndypiikz7xi55d5vsrydl"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + description = "An environmentally friendly way to deal with environment variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "envy-extensible" = callPackage ({ mkDerivation, base, doctest, envy, extensible, hspec , hspec-discover, main-tester, QuickCheck @@ -101064,46 +102271,50 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, bytestring, Cabal, cereal, containers - , directory, doctest-parallel, file-embed, filepath, generic-lens - , happy, hashable, hspec, hspec-discover, lens, mtl - , optparse-applicative, process, PyF, QuickCheck, regex-compat - , scientific, template-haskell, text, unordered-containers - , with-utf8, yaml + , blaze-markup, BNFC, bytestring, Cabal, cereal, code-page + , containers, directory, doctest-parallel, file-embed, filepath + , generic-lens, happy, hashable, hspec, hspec-core, hspec-discover + , lens, mtl, optparse-applicative, process, PyF, QuickCheck + , regex-compat, scientific, template-haskell, text, text-manipulate + , unordered-containers, with-utf8, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "1.1.0"; - sha256 = "1xzi0dgk9fac2v1g1g0i5cq19kq97crmq0903bx3m2cn22v4la40"; + version = "2.3.0"; + sha256 = "1kjznzisfyp48w297aj7jcr5w1r29x3di5z77vcsz2pvsq8x90q4"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process PyF ]; + setupHaskellDepends = [ + base bytestring Cabal code-page process PyF text with-utf8 + ]; libraryHaskellDepends = [ aeson array base blaze-html blaze-markup bytestring cereal - containers directory file-embed filepath generic-lens hashable lens - mtl PyF regex-compat scientific template-haskell text - unordered-containers yaml + code-page containers directory file-embed filepath generic-lens + hashable hspec hspec-core lens mtl PyF regex-compat scientific + template-haskell text text-manipulate unordered-containers + with-utf8 yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ aeson aeson-pretty array base blaze-html blaze-markup bytestring - cereal containers directory file-embed filepath generic-lens - hashable lens mtl optparse-applicative PyF regex-compat scientific - template-haskell text unordered-containers with-utf8 yaml + cereal code-page containers directory file-embed filepath + generic-lens hashable hspec hspec-core lens mtl + optparse-applicative PyF regex-compat scientific template-haskell + text text-manipulate unordered-containers with-utf8 yaml ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ aeson array base blaze-html blaze-markup bytestring cereal - containers directory doctest-parallel file-embed filepath - generic-lens hashable hspec hspec-discover lens mtl PyF QuickCheck - regex-compat scientific template-haskell text unordered-containers - with-utf8 yaml + code-page containers directory doctest-parallel file-embed filepath + generic-lens hashable hspec hspec-core hspec-discover lens mtl PyF + QuickCheck regex-compat scientific template-haskell text + text-manipulate unordered-containers with-utf8 yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "normalizer"; + mainProgram = "eo-phi-normalizer"; broken = true; }) {}; @@ -101471,26 +102682,26 @@ self: { "erebos" = callPackage ({ mkDerivation, async, base, binary, bytestring, c2hs, clock - , containers, cryptonite, deepseq, directory, filepath, fsnotify + , containers, crypton, deepseq, directory, filepath, fsnotify , hashable, hashtables, haskeline, iproute, libpjproject, memory , mtl, network, process, stm, template-haskell, text, time , transformers, unix, uuid, zlib }: mkDerivation { pname = "erebos"; - version = "0.1.6"; - sha256 = "153akrq6541k5m0gwhdw6bgk83b9pj3gdmzi0gafgypp0lhrg1f2"; + version = "0.1.7"; + sha256 = "0kcvnh3car18qj9hgg3j85b4fir2zy7i4dp3qbfck32qddf5i1z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base binary bytestring clock containers cryptonite deepseq + async base binary bytestring clock containers crypton deepseq directory filepath fsnotify hashable hashtables iproute memory mtl network stm text time unix uuid zlib ]; libraryPkgconfigDepends = [ libpjproject ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base bytestring cryptonite directory haskeline mtl network process + base bytestring crypton directory haskeline mtl network process template-haskell text time transformers uuid ]; description = "Decentralized messaging and synchronization"; @@ -101659,6 +102870,27 @@ self: { broken = true; }) {}; + "errata_0_4_0_3" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , hspec-golden, text + }: + mkDerivation { + pname = "errata"; + version = "0.4.0.3"; + sha256 = "024gxj7410al65rlv943wdx6f2aq8zqjp19ykzn99zyhancmhc32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base containers hspec hspec-golden text ]; + testToolDepends = [ hspec-discover ]; + description = "Source code error pretty printing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "errata-example"; + broken = true; + }) {}; + "errno" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -101923,8 +103155,8 @@ self: { pname = "ersatz"; version = "0.5"; sha256 = "1fzaany3mzzmizfzdglwqni3q842ip5z86apgdla2ynhq0hlmh3m"; - revision = "1"; - editedCabalFile = "0mg4bip6ngviyriyx3d0d588h5mm8a985gdhijd6y98yd86krb43"; + revision = "2"; + editedCabalFile = "0z56cmxs98iw15nmq2ajw57w4p8zrwz7kcgqsr27716rkpnspy4f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102163,8 +103395,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.11.2"; - sha256 = "0k78rsf98nzbc4ycf3jgari358g661v3rgg6sxm6dch0q70dhaj5"; + version = "3.5.13.0"; + sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -102181,7 +103413,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_13_0" = callPackage + "esqueleto_3_5_13_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -102191,8 +103423,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.13.0"; - sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; + version = "3.5.13.1"; + sha256 = "0ww1lmv81h8whifk79kmsv07lagqv8gkyqy77z31zl46rr2vikml"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -102324,23 +103556,25 @@ self: { "essence-of-live-coding" = callPackage ({ mkDerivation, base, containers, foreign-store, HUnit, mmorph - , mtl, QuickCheck, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, vector-sized + , mtl, profunctors, QuickCheck, selective, syb, test-framework + , test-framework-hunit, test-framework-quickcheck2, time + , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.7"; - sha256 = "1vg10x8radvr8ysqfzf1cngp2hnqy8g139x07pwqwycj9zwwnbl4"; + version = "0.2.8"; + sha256 = "04q3lkvingfjbkqb5jw79qzm3vd2rwnghnd4xyh31mliqnxphnfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foreign-store mmorph syb time transformers - vector-sized + base containers foreign-store mmorph profunctors selective syb time + transformers vector-sized ]; executableHaskellDepends = [ base transformers ]; testHaskellDepends = [ - base containers HUnit mtl QuickCheck syb test-framework + base containers HUnit mtl QuickCheck selective syb test-framework test-framework-hunit test-framework-quickcheck2 transformers + vector-sized ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; @@ -102355,8 +103589,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-PortMidi"; - version = "0.2.7"; - sha256 = "1qqswld88yvqa1z8h9rdxqqvjikhkdb67xp2sph6xb231k9710qy"; + version = "0.2.8"; + sha256 = "1pwi44ykcshm3jf3sbm3x8w2idk3rkf5k6mfk9vkvhizbnk6rwhx"; libraryHaskellDepends = [ base essence-of-live-coding PortMidi transformers ]; @@ -102372,8 +103606,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.7"; - sha256 = "0iv5wgzfxy1k80dh6c6hrzh4jcjy3ak4l3l004jm3wpfm7fm0lmx"; + version = "0.2.8"; + sha256 = "1c14m2032lfc4apfynj815z74cp8f9wr9m3cfsbs554yxard7drh"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -102409,8 +103643,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.7"; - sha256 = "0bmnc7901zgak223kfm29md0w5fd9lfv4dxc8c27cdcrdqnqfc2p"; + version = "0.2.8"; + sha256 = "1ybs72cbk35yqvjc26safab41hmmbza7ssxwqlqs0f070xn3w7p7"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -102446,8 +103680,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.7"; - sha256 = "0jn5bz7xq8jmlkhrrbn5mj3ywh8288gpx43n8fkjzmzdk233kbvp"; + version = "0.2.8"; + sha256 = "1k6va9srxp91dp2dbrav44nd3wlkpb34lb8hz6xjs0mcpynx7nr4"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -102462,8 +103696,8 @@ self: { ({ mkDerivation, base, essence-of-live-coding, vivid }: mkDerivation { pname = "essence-of-live-coding-vivid"; - version = "0.2.7"; - sha256 = "03j5kmp824s8b2x1n8dp86lh7ac8ccxh54dg0sx7v98j9lflbcqq"; + version = "0.2.8"; + sha256 = "0rjfgfhr1wfy77asrqcnh6830wwl372kxwz5nxmk9v217gfc51w2"; libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; @@ -102476,8 +103710,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.7"; - sha256 = "1zykg5qik61xr4ri6d9r04w5rj7wm0wqmnzm6nipwpixal3gdxqa"; + version = "0.2.8"; + sha256 = "1562vw03zqpzzn9v9yss6xs9vfly9glg7j2im9cllivfzngw5fas"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; @@ -103330,6 +104564,8 @@ self: { pname = "eventlog2html"; version = "0.11.1"; sha256 = "1rfyw285g48c7dck8kjykx9n4brw7ngm275n64g1wwwkm4ybn43n"; + revision = "1"; + editedCabalFile = "0kxb0990f8x394j2l7y5y2xz43lqdlm4bc6gihfqnkc6w5qsqhji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103693,6 +104929,31 @@ self: { license = lib.licenses.mit; }) {}; + "evm-opcodes_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-dword + , hedgehog, hspec, tasty, tasty-bench, tasty-discover + , tasty-hedgehog, tasty-hspec, text + }: + mkDerivation { + pname = "evm-opcodes"; + version = "0.2.0"; + sha256 = "1s5vwdway724b0c41jwiaaqg1pllnhghjydplifbhhdfv63gkrw0"; + libraryHaskellDepends = [ + base bytestring cereal containers data-dword text + ]; + testHaskellDepends = [ + base bytestring cereal containers data-dword hedgehog hspec tasty + tasty-discover tasty-hedgehog tasty-hspec text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers data-dword tasty-bench text + ]; + description = "Opcode types for Ethereum Virtual Machine (EVM)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "evoke" = callPackage ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers , lens, QuickCheck, swagger2, text @@ -103882,6 +105143,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_12" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.12"; + sha256 = "1hrj99in2x9scd68bfkq8jp9mmc4wja1vnadm2lhys12f1714sna"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -104002,17 +105275,17 @@ self: { broken = true; }) {}; - "exceptions_0_10_8" = callPackage + "exceptions_0_10_9" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers }: mkDerivation { pname = "exceptions"; - version = "0.10.8"; - sha256 = "125mgcw94x7d47ps0lkiq0g2hzzfjkmcq3gfkbi7w78az0sdjq4d"; + version = "0.10.9"; + sha256 = "0h5y2rqg7kz4ic59n5i7619766mzfpqcdill3l712nihs3q2nk4v"; revision = "1"; - editedCabalFile = "0rxaahjp8zmp3xhdvvfgkb9qz1j9vsjgr9gz2jxnq69nbnrxj7y3"; + editedCabalFile = "11p0d1gd3ybgbyplhr18wy2k7cy3hf6ab288ymy3ddayc4a927k6"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -104575,16 +105848,14 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "exon_1_7_0_0" = callPackage + "exon_1_7_1_0" = callPackage ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base , parsec, tasty, tasty-hedgehog, template-haskell }: mkDerivation { pname = "exon"; - version = "1.7.0.0"; - sha256 = "1i45lxdp6g94cxcx64jipxdpvza2qpz5m3z2h499xwljgyzyj3vy"; - revision = "2"; - editedCabalFile = "1a0a2lyg75xbnq31k3jkx3ngkr3h4islbjvblp5r0zvwn4q25mj8"; + version = "1.7.1.0"; + sha256 = "0rsgcaakhpwbgy83jwn8g2hf276wfw0akq6hld9ck5zs0k74dzfa"; libraryHaskellDepends = [ base ghc incipit-base parsec template-haskell ]; @@ -104676,6 +105947,31 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "exp-pairs_0_2_1_1" = callPackage + ({ mkDerivation, base, bimap, containers, deepseq, ghc-prim, matrix + , prettyprinter, QuickCheck, random, raw-strings-qq, smallcheck + , tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "exp-pairs"; + version = "0.2.1.1"; + sha256 = "01n730xafan7yf11bzsp40vi30an7risyxvnp16hzjxwlg6xlkpi"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim prettyprinter + ]; + testHaskellDepends = [ + base matrix QuickCheck random smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base bimap containers prettyprinter raw-strings-qq tasty-bench + ]; + description = "Linear programming over exponent pairs"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "expand" = callPackage ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }: mkDerivation { @@ -105193,6 +106489,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "extended-reals_0_2_5_0" = callPackage + ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "extended-reals"; + version = "0.2.5.0"; + sha256 = "17jvnxnd2v7yjzssbyqhzpjhvzfzis253fjz2kjqd2y3bi8lyfr9"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th + ]; + description = "Extension of real numbers with positive/negative infinities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, ghc-prim, hashable, incremental, lens @@ -105215,6 +106529,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "extensible_0_9_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, ghc-prim, hashable, incremental, lens + , membership, prettyprinter, primitive, profunctors, QuickCheck + , StateVar, tagged, template-haskell, text, th-lift, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "extensible"; + version = "0.9.2"; + sha256 = "0ynw3w569rvkz4076wzzpg3fa9y7vmhwjk6chb8z4hz237pmifmx"; + libraryHaskellDepends = [ + aeson base bytestring cassava comonad constraints deepseq ghc-prim + hashable incremental membership prettyprinter primitive profunctors + QuickCheck StateVar tagged template-haskell text th-lift + transformers unordered-containers vector + ]; + testHaskellDepends = [ base lens QuickCheck template-haskell ]; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -105424,6 +106761,8 @@ self: { pname = "extensions"; version = "0.1.0.3"; sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm"; + revision = "1"; + editedCabalFile = "1nd8zmxqlwnc3ksm13ld5d1rr6vhdi9dykp42mfk5lim7iyw3lj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105465,8 +106804,8 @@ self: { }: mkDerivation { pname = "extism"; - version = "1.2.1.0"; - sha256 = "0x2vwc5r812i3jk7z9y8qfkxlq3acqv560y1z97fsahkb1frydqy"; + version = "1.3.0.0"; + sha256 = "171ikqzya40gdwxzrzym020vhvd44srnfpy09303bcnp6gvn5zfb"; libraryHaskellDepends = [ base binary bytestring extism-manifest json uuid ]; @@ -105482,8 +106821,8 @@ self: { ({ mkDerivation, base, base64-bytestring, bytestring, json }: mkDerivation { pname = "extism-manifest"; - version = "1.2.1.0"; - sha256 = "1jxv93grdvr02q7gqg1gg9vqjirn3z84x8992zz3spgf4p1h2f2i"; + version = "1.3.0.0"; + sha256 = "1wfxz4ynllcps51xzby826h67lmsa85kd1d7jp1lbk4gkmjhiqz3"; libraryHaskellDepends = [ base base64-bytestring bytestring json ]; description = "Extism manifest bindings"; license = lib.licenses.bsd3; @@ -106212,8 +107551,8 @@ self: { pname = "falsify"; version = "0.2.0"; sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; - revision = "3"; - editedCabalFile = "0wpdv7xjf2q8wk3zql5y73ly4mky14m9rc4ql4g82x7biabnm7xg"; + revision = "4"; + editedCabalFile = "125c2jsl085kd0i4pdxkawpx43jlgn18xqf86r97f1ax15142p5g"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -106402,6 +107741,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "fast-logger_3_2_5" = callPackage + ({ mkDerivation, array, async, auto-update, base, bytestring + , directory, easy-file, filepath, hspec, hspec-discover, stm, text + , unix-compat, unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.2.5"; + sha256 = "0cddv18k0n1hdbjf0szqq7pl5r0h4srzxy8pmr66a4pc1w410lii"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath stm + text unix-compat unix-time + ]; + testHaskellDepends = [ async base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -107019,21 +108379,21 @@ self: { , bytestring, config-ini, copr-api, directory, either , email-validate, extra, fedora-releases, filepath, http-conduit , http-directory, http-query, koji, network-uri, pagure - , pretty-terminal, process, rpm-nvr, rpmbuild-order, say + , pretty-terminal, process, rpm-nvr, rpmbuild-order, safe, say , select-rpms, simple-cmd, simple-cmd-args, simple-prompt, text , time, typed-process, unix, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.5"; - sha256 = "1jj2nnjqpqj1fxx7vliq1ayzwdp6xaphbdln8w2fifwbp8k3znjj"; + version = "1.6.1"; + sha256 = "1hixxzx1f9x5mj84220mc9hf94lpyq42qp00s3yry79kaiwwh7cz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base bodhi bugzilla-redhat bytestring config-ini copr-api directory either email-validate extra fedora-releases filepath http-conduit http-directory http-query koji network-uri - pagure pretty-terminal process rpm-nvr rpmbuild-order say + pagure pretty-terminal process rpm-nvr rpmbuild-order safe say select-rpms simple-cmd simple-cmd-args simple-prompt text time typed-process unix utf8-string xdg-basedir ]; @@ -107106,8 +108466,8 @@ self: { pname = "fcf-base"; version = "0.1.0.0"; sha256 = "19jrcpj496bpchv8fw30vd5b5w3sj1qkzmh5jlahyvz5wsppzwsq"; - revision = "1"; - editedCabalFile = "0j71pgy6cp6jadyx8726daa91j795y9p3r3w0x3jvffpnlk9aibp"; + revision = "2"; + editedCabalFile = "0vmw1srmzl3c3j4pdnaa2lvkcvlya2kccp4j33ayscmlnx29fqn3"; libraryHaskellDepends = [ base fcf-family ]; testHaskellDepends = [ base fcf-family ]; description = "Family-of-families instances for base"; @@ -107168,6 +108528,8 @@ self: { pname = "fcf-family"; version = "0.2.0.1"; sha256 = "0dgbzin82da8a8j0xm9ijkaj5ifk2ca0cx02x5glr07qzzhpa9k5"; + revision = "1"; + editedCabalFile = "1ay0an8smfw4q2yrvfs6n1fc61lgnp0ky66d0d6swc8lv5ds9rda"; libraryHaskellDepends = [ base containers first-class-families template-haskell ]; @@ -107539,6 +108901,21 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-releases_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bodhi, cached-json-file, extra, safe + }: + mkDerivation { + pname = "fedora-releases"; + version = "0.2.0"; + sha256 = "1phkcgrbspp1yd4axnfdsp3rfzdb1mka7fy0zb3chsi97g34ki1j"; + libraryHaskellDepends = [ + aeson base bodhi cached-json-file extra safe + ]; + description = "Library for Fedora release versions"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, cached-json-file, case-insensitive , curl, directory, extra, filepath, Glob, regex-compat, safe @@ -108668,6 +110045,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-io_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath, tasty + , tasty-hunit, temporary, unix + }: + mkDerivation { + pname = "file-io"; + version = "0.1.5"; + sha256 = "0nvxp3d7j2fdkfcvk5n7swc0id7c7gzp3g0jr4q4vpljqzj1j2ii"; + libraryHaskellDepends = [ base bytestring deepseq filepath unix ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit temporary + ]; + description = "Basic file IO operations via 'OsPath'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-location" = callPackage ({ mkDerivation, base, containers, HUnit, lifted-base, process , template-haskell, th-orphans, transformers @@ -108756,8 +110150,8 @@ self: { pname = "file-uri"; version = "0.1.0.0"; sha256 = "1bnsc1527qcvnz5ihv1phzbdif6qg01r3qmgj4dk1fzzn79mqnxl"; - revision = "2"; - editedCabalFile = "0vysq1q10zp4agcrfgzy7lrjgf2q2nj8fgs17v4n54r4vqmw3p6n"; + revision = "3"; + editedCabalFile = "1qmb30gcmj8ckmjxyhhkixpcikwmf4nnd926pghixl2ylwb79dl2"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; benchmarkHaskellDepends = [ base tasty-bench ]; @@ -108771,8 +110165,8 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.5.1"; - sha256 = "0nsq25gj0yyjx27hrpwpxvx0sfh4n36rhdx4lxy3drn70746spgq"; + version = "0.5.2"; + sha256 = "1h7l5r5dlb793in1jqfic4j5rbvp0xj9hr2a34h17lbmp7fs5k0r"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -108851,7 +110245,7 @@ self: { broken = true; }) {}; - "filepath_1_5_3_0" = callPackage + "filepath_1_5_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions , generic-deriving, generic-random, os-string , quickcheck-classes-base, tasty, tasty-bench, tasty-quickcheck @@ -108859,8 +110253,8 @@ self: { }: mkDerivation { pname = "filepath"; - version = "1.5.3.0"; - sha256 = "0nhsjfbm31rxsx4hbx8wh9ir3845j7pcjhgb1rz7rpjkzr2fq1yq"; + version = "1.5.4.0"; + sha256 = "1bswvf1hrsslb8xlwvsccz12h5habrdpqq4zgcyjg4zm6b28dajl"; libraryHaskellDepends = [ base bytestring deepseq exceptions os-string template-haskell ]; @@ -109167,16 +110561,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fin_0_3_1" = callPackage + "fin_0_3_2" = callPackage ({ mkDerivation, base, boring, dec, deepseq, hashable , inspection-testing, QuickCheck, some, tagged, universe-base }: mkDerivation { pname = "fin"; - version = "0.3.1"; - sha256 = "1y98g48dr046d1v300aj10dq5mrn79yj769gcld01834xi0ng010"; - revision = "1"; - editedCabalFile = "1q6hq4m95b89ig3c21p36ng904vj84r5ga3brj589ifs068lpvv4"; + version = "0.3.2"; + sha256 = "0h912rcy2krba01yd1xq6wyj2mnq7bqr7ap6rcdfw0sgkxa5j9dr"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -110157,8 +111549,8 @@ self: { ({ mkDerivation, base, deepseq, doctest, fixed-vector, primitive }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.6.1.1"; - sha256 = "1amqpbvzyqfg5rsl4zm99qmiffbh0a5bf9jbwlm6snwm9024qsj3"; + version = "0.6.2.0"; + sha256 = "1flqm18gcwc4f54y3b5axyfhdq9wn4069y64nbsmh064d23bln5s"; libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; testHaskellDepends = [ base doctest fixed-vector ]; description = "Library for working with product types generically"; @@ -110403,8 +111795,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "2"; - editedCabalFile = "1byq496k06whqxdiaa7s3f4hh8mbawm6i0a9pgkbj239y14c3qpj"; + revision = "3"; + editedCabalFile = "1s1x9dzzryccpsdyaqhivz5awlwrwqhmkfnvv58wpxqyjcc236jp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -110691,8 +112083,33 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.5.1.0"; - sha256 = "1hczq8x2qmvhxvdn6yb1dcq18ahm917dq0vjvhni6d5d9sa6r2fb"; + version = "0.5.1.1"; + sha256 = "1xk7sdppslk85jhxqrd1bfn7wnz7yxaxrls9vz1fnhi745sw0xhb"; + libraryHaskellDepends = [ + base bytestring containers integer-gmp template-haskell utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec HUnit QuickCheck quickcheck-instances + utf8-string + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring gauge integer-gmp megaparsec parsec + primitive utf8-string + ]; + description = "High-performance parsing from strict bytestrings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raehik ]; + }) {}; + + "flatparse_0_5_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, gauge + , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive + , QuickCheck, quickcheck-instances, template-haskell, utf8-string + }: + mkDerivation { + pname = "flatparse"; + version = "0.5.2.0"; + sha256 = "1w2xpzfnwnf2r3bgfnfnjbbzy9l92x5qyncamr8k1bq7xhf041l5"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell utf8-string ]; @@ -110706,6 +112123,7 @@ self: { ]; description = "High-performance parsing from strict bytestrings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; }) {}; @@ -111786,16 +113204,14 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, hspec-discover - , stm, stm-delay, time + ({ mkDerivation, base, data-default, hspec, hspec-discover, stm + , stm-delay, time }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.12"; - sha256 = "1swlbsgqw6zhqr3rssbl2dmkkh81rw8qykz437py7r652p8plza3"; - libraryHaskellDepends = [ - base data-default-class stm stm-delay time - ]; + version = "0.2.0.14"; + sha256 = "1qdfbgk120ck1a50r2993438qgrwqz33yag4yw8f51yvqzx8v0xc"; + libraryHaskellDepends = [ base data-default stm stm-delay time ]; testHaskellDepends = [ base hspec stm time ]; testToolDepends = [ hspec-discover ]; description = "Fold multiple events that happen in a given period of time"; @@ -111873,6 +113289,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "foldable1-classes-compat_0_1_1" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, QuickCheck + , quickcheck-instances, tagged, tasty-bench, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "foldable1-classes-compat"; + version = "0.1.1"; + sha256 = "17xmc3525crnd86rrl2c50rfnhibwh5xbqrnmvzvyns4d3l4vvdg"; + revision = "1"; + editedCabalFile = "1yd6ksym0jxhagyps93w1dlw9rrfsnps96m44md5n90z0qzalnm7"; + libraryHaskellDepends = [ base ghc-prim tagged ]; + testHaskellDepends = [ + base containers QuickCheck quickcheck-instances test-framework + test-framework-quickcheck2 transformers + ]; + benchmarkHaskellDepends = [ + base containers deepseq tasty-bench transformers + ]; + doHaddock = false; + description = "Compatibility package for the Foldable1 and Bifoldable1 type classes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, primitive @@ -111895,6 +113336,29 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "foldl_1_4_18" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, primitive + , profunctors, random, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.18"; + sha256 = "03jhj5p017r6f75vb0dk6igcaklgykjpp23j5wk7blzph18z9n6a"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable primitive + profunctors random semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion profunctors ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, foldl, hedgehog, safe-exceptions }: mkDerivation { @@ -112300,6 +113764,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "force-layout_0_4_1" = callPackage + ({ mkDerivation, base, containers, data-default, lens, linear }: + mkDerivation { + pname = "force-layout"; + version = "0.4.1"; + sha256 = "0mas3v19mhzcb4rdn6033rmnbw36y3yw240q2cbpr6z4rfk1wxqq"; + libraryHaskellDepends = [ + base containers data-default lens linear + ]; + description = "Simple force-directed layout"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fordo" = callPackage ({ mkDerivation, base, process, transformers }: mkDerivation { @@ -113123,10 +114601,8 @@ self: { }: mkDerivation { pname = "fp-ieee"; - version = "0.1.0.4"; - sha256 = "1zba050nwsf2iidxklibndja5kmszc5k7jmimchszrnc821d0cqg"; - revision = "1"; - editedCabalFile = "0bryqkf0h9a102bk7albf4pd1mjgs2l2wa6jc96sqly75ddr4d06"; + version = "0.1.0.5"; + sha256 = "1alrzx3y39j4bxjgvvx4mj8a3hiifixv4wxy7222lnz6mx18n8pb"; libraryHaskellDepends = [ base ghc-bignum integer-logarithms ]; testHaskellDepends = [ base doctest hspec hspec-core integer-logarithms QuickCheck random @@ -113506,17 +114982,19 @@ self: { , hspec-core, hspec-expectations-lifted, hspec-junit-formatter , http-client, http-types, HUnit, immortal, lens, monad-control , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 - , path-pieces, persistent, persistent-postgresql, postgresql-simple - , primitive, QuickCheck, resource-pool, resourcet, scientist - , semigroupoids, servant-server, template-haskell, text, time - , transformers, transformers-base, typed-process, unliftio - , unordered-containers, vector, wai, wai-extra, yaml, yesod-core - , yesod-test + , path-pieces, persistent, persistent-postgresql + , persistent-sql-lifted, postgresql-simple, primitive, QuickCheck + , resource-pool, resourcet, scientist, semigroupoids + , servant-server, template-haskell, text, time, transformers + , transformers-base, typed-process, unliftio, unordered-containers + , vector, wai, wai-extra, yaml, yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.3.0"; - sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; + version = "1.21.0.0"; + sha256 = "00z5dymp8xb1a0hai697zrkgl99sprinvfm1bf9c0r8ng259n10s"; + revision = "1"; + editedCabalFile = "0mc6fcvbc1m8013pb95pr2i7005r3f70a7hh9ycncipf8ydg0jr4"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava @@ -113528,9 +115006,9 @@ self: { hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-types HUnit immortal lens monad-control monad-validate MonadRandom mtl nonempty-containers openapi3 - path-pieces persistent persistent-postgresql postgresql-simple - primitive QuickCheck resource-pool resourcet scientist - semigroupoids servant-server template-haskell text time + path-pieces persistent persistent-postgresql persistent-sql-lifted + postgresql-simple primitive QuickCheck resource-pool resourcet + scientist semigroupoids servant-server template-haskell text time transformers transformers-base typed-process unliftio unordered-containers vector wai wai-extra yaml yesod-core yesod-test @@ -113618,8 +115096,8 @@ self: { }: mkDerivation { pname = "freckle-kafka"; - version = "0.0.0.1"; - sha256 = "1ifm5axxng5bknz4v7zv8pjv0fv91hnv2l8jh22s4llj0wax1l28"; + version = "0.0.0.2"; + sha256 = "1g2ynl6sxrj42jjjzf4y0bkh54alnd93c6gclgg0kqs593k0a2qx"; libraryHaskellDepends = [ aeson annotated-exception base Blammo bytestring containers freckle-env hs-opentelemetry-sdk hw-kafka-client lens mtl @@ -113731,8 +115209,8 @@ self: { pname = "free"; version = "5.2"; sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; - revision = "5"; - editedCabalFile = "0vn4rk8gw60571j4smw8x7jldigj3i84jr0rycxlkag94w6rrr1i"; + revision = "6"; + editedCabalFile = "1n8yx64gffqiqkkmn67bfhnfafgf1c10m9mm7yb8b5fiv21kx5hj"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -113748,8 +115226,8 @@ self: { }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.8"; - sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; + version = "1.0.0.9"; + sha256 = "0avy7n3m9qjpdiwpb52igznpjv1qscv8d8i6jcycp358hwns680d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hspec QuickCheck relude tasty tasty-hspec text time @@ -113856,18 +115334,19 @@ self: { "free-foil" = callPackage ({ mkDerivation, array, base, bifunctors, containers, deepseq - , doctest-parallel, template-haskell, text + , doctest-parallel, kind-generics, template-haskell, text }: mkDerivation { pname = "free-foil"; - version = "0.1.0"; - sha256 = "0a0mpacwpyj46p79l3imwazp7a3hlm1bwjh5v1x7sk93kyb8d9fg"; + version = "0.2.0"; + sha256 = "19b9bda5vwc9zqj5f555l2c5nvs31l7ja3yp8xw8lqihfjkk8gp8"; libraryHaskellDepends = [ - array base bifunctors containers deepseq template-haskell text + array base bifunctors containers deepseq kind-generics + template-haskell text ]; testHaskellDepends = [ array base bifunctors containers deepseq doctest-parallel - template-haskell text + kind-generics template-haskell text ]; description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; license = lib.licenses.bsd3; @@ -114938,8 +116417,8 @@ self: { }: mkDerivation { pname = "fs-sim"; - version = "0.3.0.1"; - sha256 = "1r094vpwpmq3956zs2yqvpliz0aq0wb71pnw566kcxm1rvv91wjr"; + version = "0.3.1.0"; + sha256 = "0qq7fc9b37haz2dcywyxhkszy58i3fr7z8nyrrp16x46v5cs6jwq"; libraryHaskellDepends = [ base base16-bytestring bytestring containers fs-api io-classes mtl primitive QuickCheck safe-wild-cards text @@ -115005,8 +116484,8 @@ self: { pname = "fsnotify"; version = "0.3.0.1"; sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; - revision = "2"; - editedCabalFile = "12m0y5583plk9pikvwqy1rc0yyvicxf8j5nz0nwxb4grsgfqrv7v"; + revision = "3"; + editedCabalFile = "0n5p6ljx8i5mmalkw05izjgzbqg08y7rxxn2gk8ghxlqldgqgix9"; libraryHaskellDepends = [ async base bytestring containers directory filepath hinotify shelly text time unix unix-compat @@ -115030,6 +116509,8 @@ self: { pname = "fsnotify"; version = "0.4.1.0"; sha256 = "1vzpx91n2qml0628zq1c0bwnz7d4bal4vwl52hyil60shx5gnc6i"; + revision = "1"; + editedCabalFile = "1r8q07d5232lfxsdx9i1kfwlmr2kirz8g9k18ahz054pvwggs9y6"; libraryHaskellDepends = [ async base bytestring containers directory filepath hinotify monad-control safe-exceptions text time unix unix-compat @@ -115212,6 +116693,8 @@ self: { pname = "ftp-client"; version = "0.5.1.6"; sha256 = "0xlrmzngdzg8h7lcb6kaz1zcm3kd1rdax4xs0h048iz7f78q18dg"; + revision = "1"; + editedCabalFile = "14pdfmm796mv3qd5y2rq8pj429v31w1d3dlxgyvypjmjh07v87gf"; libraryHaskellDepends = [ attoparsec base bytestring containers crypton-connection data-default-class exceptions network transformers @@ -115822,6 +117305,22 @@ self: { broken = true; }) {}; + "functora-witch" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged, text + , transformers + }: + mkDerivation { + pname = "functora-witch"; + version = "1.2.0.2"; + sha256 = "0zij8si5zyrfgg0gjh4b459l1y6b9n8kqn8jpkxwmbm2xzhrxjbb"; + libraryHaskellDepends = [ base bytestring containers tagged text ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + }) {}; + "functorm" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116221,7 +117720,7 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base + ({ mkDerivation, aeson, alex, ansi-terminal, array, async, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, co-log-core, containers , cryptohash-md5, Diff, directory, directory-tree, dlist, fgl @@ -116236,15 +117735,15 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.23"; - sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; + version = "0.25.25"; + sha256 = "04a9z8c1js3d8921araz9n91wahzfsw84wrslwny6h7wqvjda88q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base base16-bytestring binary blaze-html - bmp bytestring bytestring-to-vector cmark-gfm co-log-core - containers cryptohash-md5 Diff directory directory-tree dlist fgl - fgl-visualize file-embed filepath free futhark-data + aeson ansi-terminal array async base base16-bytestring binary + blaze-html bmp bytestring bytestring-to-vector cmark-gfm + co-log-core containers cryptohash-md5 Diff directory directory-tree + dlist fgl fgl-visualize file-embed filepath free futhark-data futhark-manifest futhark-server githash half haskeline language-c-quote lens lsp lsp-types mainland-pretty megaparsec mtl mwc-random neat-interpolation parallel prettyprinter @@ -118228,6 +119727,28 @@ self: { pname = "generic-data"; version = "1.1.0.1"; sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; + revision = "1"; + editedCabalFile = "03qi9y1zippj9dsfk0afargl1crhjbms0hjs8y9y6vhanll5czm2"; + libraryHaskellDepends = [ + ap-normalize base base-orphans ghc-boot-th show-combinators + ]; + testHaskellDepends = [ + base generic-lens one-liner show-combinators tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base deepseq tasty-bench ]; + description = "Deriving instances with GHC.Generics and related utilities"; + license = lib.licenses.mit; + }) {}; + + "generic-data_1_1_0_2" = callPackage + ({ mkDerivation, ap-normalize, base, base-orphans, deepseq + , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty + , tasty-bench, tasty-hunit + }: + mkDerivation { + pname = "generic-data"; + version = "1.1.0.2"; + sha256 = "1dfs728nbkilzfmdk6gnjk7wdk1habqn35pb071zcmcp8ll0lzpj"; libraryHaskellDepends = [ ap-normalize base base-orphans ghc-boot-th show-combinators ]; @@ -118237,6 +119758,7 @@ self: { benchmarkHaskellDepends = [ base deepseq tasty-bench ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "generic-data-asserts" = callPackage @@ -118311,6 +119833,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-deriving_1_14_6" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.14.6"; + sha256 = "1bxjar1kc29nma3whxb0kqgjgxmmm7wvhql7pyick8rj39zw35gi"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -118577,8 +120117,8 @@ self: { }: mkDerivation { pname = "generic-persistence"; - version = "0.6.0"; - sha256 = "00clpi6ijwagp3zrjb94kwv03wxcx4aqq22zn32kxhz8b3w71jd1"; + version = "0.7.0.1"; + sha256 = "1w32mlwnpiw81qaqwkivsbzpqbhi4c13qcy7ki34w71fiwyhahpd"; libraryHaskellDepends = [ base convertible generic-deriving HDBC raw-strings-qq resource-pool template-haskell @@ -118783,8 +120323,8 @@ self: { pname = "generically"; version = "0.1.1"; sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; - revision = "3"; - editedCabalFile = "1hl8690xqb6af5i5jn5s55s29hpx9fq1ghdnxi5l1li2q25666qv"; + revision = "4"; + editedCabalFile = "0bj5vhnrggf9ka89z628hcxx1g3r00lv2rrrjv3dfbaqbj7jfr1z"; libraryHaskellDepends = [ base ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -120356,24 +121896,24 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_10_1" = callPackage + "ghc_9_12_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions - , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, semaphore-compat, stm, template-haskell, time + , filepath, genprimopcode, ghc-boot, ghc-boot-th, ghc-heap, ghci + , happy, hpc, os-string, process, semaphore-compat, stm, time , transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.10.1"; - sha256 = "0vdhjqfcwjnhr2dijjqcwvybfy2pvfsynh87wh9hbak9w0ppwvha"; + version = "9.12.1"; + sha256 = "179gp0lqrxhvzc0pyxwmkvxpilm6c201s1pjws3dl8qqyddliiqs"; setupHaskellDepends = [ base Cabal containers directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-boot ghc-heap ghci hpc process - semaphore-compat stm template-haskell time transformers unix + exceptions filepath ghc-boot ghc-boot-th ghc-heap ghci hpc + os-string process semaphore-compat stm time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -120432,16 +121972,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_10_1" = callPackage + "ghc-boot_9_12_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, ghc-platform, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.10.1"; - sha256 = "02sqxmc2f8lb95hrabj088618sd9by9ypvsrs2f2753dg1xqlbzg"; - revision = "1"; - editedCabalFile = "07pn68dhxfmkh7j49vfswjd480j0f60r87azbwqyglv8cl19bz4h"; + version = "9.12.1"; + sha256 = "10yylnkjn628pbdqs2zvvxh3208xrjav8l7mqz7ck7gb9pvx44z4"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -120827,6 +122365,29 @@ self: { mainProgram = "ghc-events"; }) {}; + "ghc-events_0_20_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.20.0.0"; + sha256 = "11p3i8jjsxffvh77dlmygh78hyavhkgmk4rhq9khp45br5xshwkk"; + revision = "1"; + editedCabalFile = "1kwhh5cqgvgadabban5kzhfjs6xsmbcd0yhqp6dpr4hpggv5cw4n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-events"; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -121011,12 +122572,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_10_0_0" = callPackage + "ghc-exactprint_1_11_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.10.0.0"; - sha256 = "14jwkx0q2bidcv5ss7zmkvl41z264k7siy9fh7py27h7azb539v0"; + version = "1.11.0.0"; + sha256 = "1rpryylgjrvp595rhv68fa1rf35gy9nswc97dw0lwm7dyw7dbyy2"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -121028,8 +122589,8 @@ self: { ({ mkDerivation, base, ghc-internal, ghc-prim }: mkDerivation { pname = "ghc-experimental"; - version = "0.1.0.0"; - sha256 = "144s8ja4jdasq65db1q4342ny1cd0d1ad48axd9gzv1h0mmqkz4f"; + version = "9.1201.0"; + sha256 = "10rk2vvf6sh1wbg6hkcb9lnnvxysyjjgz24dhdz7k12gwnlgnf7i"; libraryHaskellDepends = [ base ghc-internal ghc-prim ]; description = "Experimental features of GHC's standard library"; license = lib.licenses.bsd3; @@ -121078,12 +122639,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_10_1" = callPackage + "ghc-heap_9_12_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.10.1"; - sha256 = "1vkvi646gspj0i4llq40asdjmzwwczglci0qi8rv7lq75v6g1kl6"; + version = "9.12.1"; + sha256 = "02g1r4hxz7w1a82mb9z7zzjad54hl9m4k1i59d1adsr8cc1cg75p"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -121203,10 +122764,8 @@ self: { ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "ghc-internal"; - version = "9.1001.0"; - sha256 = "0z38v4gnyis99r3rli2g3dyg948d98lhd1ylz5irbghnvrn8myhl"; - revision = "1"; - editedCabalFile = "1rx55yc51xaarcyj8mgrdn6pmr8ri2n962h813dy5vc1pj49g8yz"; + version = "9.1201.0"; + sha256 = "046jam2fw5y8wqlkpnwigi2sjwgf45f572xs3nk228h6wxgfsl9y"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -121271,7 +122830,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_3_20241022" = callPackage + "ghc-lib_9_8_4_20241130" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121279,10 +122838,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.3.20241022"; - sha256 = "0irdlkkb139spmggjam2n4ydcwkb1r8vsv29g5w9rxqd5rd66w1b"; + version = "9.8.4.20241130"; + sha256 = "016lsdv24lpm8dbac62xvrdw6bvvvivwgdcq9r8a5hzwjakbrqsr"; revision = "1"; - editedCabalFile = "0r1a022nf2kk9vk5ca7crx74fzi0vcd8r5c5ldarcvqjfhgayfvi"; + editedCabalFile = "0wim3zn9ihvjksc9p58qfb4d65cnmnv1f266wphl3hvq9gip33bz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121295,7 +122854,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_10_1_20240511" = callPackage + "ghc-lib_9_10_1_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121303,10 +122862,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.10.1.20240511"; - sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; - revision = "1"; - editedCabalFile = "0zzp85lr6lps0w1ld535sc73nz4dmrk48rwvngzdwzb460lnqsiv"; + version = "9.10.1.20241103"; + sha256 = "1wzjzfh3cvbmq957plngq41cwi1x63z8f5n5j69xpqkdf64z517g"; + revision = "2"; + editedCabalFile = "1nb61mg0p39258gqwgwh6wc35mdxcps5afwccgiqa3k22rfjdhbg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121319,6 +122878,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib_9_12_1_20241218" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, os-string, parsec, pretty, process, rts + , semaphore-compat, stm, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.12.1.20241218"; + sha256 = "116541qwj1pd42p3gd0hiyf5r15rp9sjkzvhpkk31jx00y3in8vz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc os-string parsec + pretty process rts semaphore-compat stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_2_8_20230729" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -121360,17 +122941,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_3_20241022" = callPackage + "ghc-lib-parser_9_8_4_20241130" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.3.20241022"; - sha256 = "0gnd9dvjbis9vdgjk671x9ys6b0af7399mim8gpi6dpa1nczgc7b"; - revision = "2"; - editedCabalFile = "0qbqx6qg8hab2il9idmxjfwhk7s86ffp24836irc85aazmpvzsxv"; + version = "9.8.4.20241130"; + sha256 = "0zhw6x0z75mns6j4knbxbwavj267crb3xf4mpd3h9mrpg067vx7s"; + revision = "1"; + editedCabalFile = "1m5gdq7xd02d559r050wzrm4lm269xi5s6ri3qzn21xmjj3jpmqq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121383,17 +122964,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_10_1_20240511" = callPackage + "ghc-lib-parser_9_10_1_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.10.1.20240511"; - sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; - revision = "1"; - editedCabalFile = "0lsjzmdyqbganrq492vwwkx5j05p34vwn4bjkrd5zjww17fazfcj"; + version = "9.10.1.20241103"; + sha256 = "17q8h8xaa7rn384zq3x7br93mi9g6gwqzp01bh99929qk0mvrsil"; + revision = "2"; + editedCabalFile = "02w33rvb6vfx7am6w0ri4if4m3lk1zf60mw4ibazzqgl4rbkf7im"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121406,6 +122987,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser_9_12_1_20241218" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy + , os-string, parsec, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.12.1.20241218"; + sha256 = "0n3shswiljjsaf46wk5qmcp55na5df2s7384sxml85qkf3025jd4"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim os-string parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate @@ -121485,6 +123087,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_12_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, optparse-applicative, tasty + , tasty-hunit, time, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.12.0.0"; + sha256 = "0w8mfa0g55m5i5ysxlkgci1grssi76za4523ygmsicb0ibq9ajb2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + executableHaskellDepends = [ + base directory extra filepath optparse-applicative time + ]; + testHaskellDepends = [ + base bytestring containers directory extra filepath ghc-lib-parser + tasty tasty-hunit uniplate + ]; + description = "Programming with GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-lib-parser-ex-build-tool"; + }) {}; + "ghc-magic-dict-compat" = callPackage ({ mkDerivation, base, dlist, falsify, ghc, ghc-prim , ghc-tcplugins-extra, tasty, tasty-discover, tasty-hunit @@ -121656,8 +123285,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-parser"; - version = "0.2.6.0"; - sha256 = "177glyhd9qr4z19zl8ycdy2302k8jzyhrkh14dp92dp86iydlxp6"; + version = "0.2.7.0"; + sha256 = "08m1jb093pkmbj7km7xclq6f1jz20v313ih9b4fydis974i8pv3h"; libraryHaskellDepends = [ base ghc ]; description = "Haskell source parser from GHC"; license = lib.licenses.mit; @@ -121669,8 +123298,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; - revision = "6"; - editedCabalFile = "13j23fnlh18zqh5m4y8b5skhavq9kjx2jl6kyxvmfcmdi3q4nwjf"; + revision = "7"; + editedCabalFile = "0irq8j1bz5z3da1g4xd3dp392hwi2xn1cjsrdiqyp4srjlyg2532"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -121743,13 +123372,13 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-prim_0_11_0" = callPackage + "ghc-prim_0_13_0" = callPackage ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.11.0"; - sha256 = "118c37r8q94x0za1x6iqlfl429czgp5ii6mjdb1f7ba3nx9azzl5"; + version = "0.13.0"; + sha256 = "0qybdd79cnz88af4icwa9d7m9g08az5qyc1sflb0nkzj6iimrwnf"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ rts ]; librarySystemDepends = [ c ]; @@ -121890,7 +123519,7 @@ self: { broken = true; }) {}; - "ghc-source-gen" = callPackage + "ghc-source-gen_0_4_5_0" = callPackage ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -121904,6 +123533,25 @@ self: { ]; description = "Constructs Haskell syntax trees for the GHC API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ghc-source-gen" = callPackage + ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "ghc-source-gen"; + version = "0.4.6.0"; + sha256 = "00rgfsa7jmg29y9nknaqbshy96km2gxa8g91pgspw29rhw2ir3ll"; + revision = "1"; + editedCabalFile = "1kap75bw4i0wirx3ban6hgqh5cfq900l8jg9qm16y9fd0rwcff9j"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ + base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Constructs Haskell syntax trees for the GHC API"; + license = lib.licenses.bsd3; }) {}; "ghc-srcspan-plugin" = callPackage @@ -122188,8 +123836,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.12.0.0"; - sha256 = "0gl5zhfvvkqa36ccl5hxjrw6pgpl1giwa1ysq4kbw41df8cwcxxl"; + version = "0.14.0.0"; + sha256 = "089lw1gjxrk54s1agl5gxkwg49368z6i6m260snz05nfia4m7fak"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -122681,21 +124329,21 @@ self: { "ghcitui" = callPackage ({ mkDerivation, array, base, brick, containers, errors, extra - , file-embed, ghcid, hspec, microlens, microlens-th + , file-embed, fsnotify, ghcid, hspec, microlens, microlens-th , optparse-applicative, regex-base, regex-tdfa, string-interpolate , text, text-zipper, transformers, utf8-string, vector, vty , word-wrap }: mkDerivation { pname = "ghcitui"; - version = "0.3.0.0"; - sha256 = "1b214pl7d6hzw18zgard811lws63k421nq4mzl2qcyh9s67yljbp"; + version = "0.4.1.0"; + sha256 = "05c9s43qhzxc280xycicwrm95kl1jpz14pzlcnv0a29i8589gpdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base brick containers errors extra file-embed ghcid microlens - microlens-th regex-base regex-tdfa string-interpolate text - text-zipper transformers utf8-string vector vty word-wrap + array base brick containers errors extra file-embed fsnotify ghcid + microlens microlens-th regex-base regex-tdfa string-interpolate + text text-zipper transformers utf8-string vector vty word-wrap ]; executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base hspec text ]; @@ -123936,23 +125584,23 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_9" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base + "gi-gtk_4_0_11" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-graphene + , gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtk"; - version = "4.0.9"; - sha256 = "0pccbinm41shskr9l20m42mdvn2v11nylpwq2r4yz30lkpw401if"; + version = "4.0.11"; + sha256 = "17y5n3qk92pjf2h6qx3ibjwhbdbmzv505a8m628iwpra137r4m48"; setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-graphene gi-gsk gi-pango haskell-gi + base Cabal gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject + gi-graphene gi-gsk gi-pango haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi + base bytestring containers gi-cairo gi-gdk gi-gdkpixbuf gi-gio + gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk4 ]; @@ -124013,8 +125661,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.16"; - sha256 = "1zdkxhvy4i99p6qcrc53qlxv71vh05w9xd0j1qh20aci05n1nnha"; + version = "0.3.17"; + sha256 = "022g7xlwli8rbasxgafpp2j6ybk5iyk1hlwlg7nph361k3c0l7p6"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -124297,6 +125945,29 @@ self: { broken = true; }) {inherit (pkgs) keybinder;}; + "gi-nm" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, networkmanager, text, transformers + }: + mkDerivation { + pname = "gi-nm"; + version = "1.0.1"; + sha256 = "02lg4032c29yyn2fyr0qc30ccnng188n41dh4n5lc21qcycvzryz"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ networkmanager ]; + description = "NM bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) networkmanager;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -124444,8 +126115,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.18"; - sha256 = "0z4knqmhcicqnmamzibl1xwarjl7y1da0127jg7s1n7a780dgnd5"; + version = "0.0.19"; + sha256 = "0070li67sl96cbqvywig532a00aqlc7spbf94v8bkj5qy7fph9nz"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -124810,6 +126481,8 @@ self: { pname = "ginger"; version = "0.10.5.2"; sha256 = "0nwcppbfxj3nvq3hm9gj8gh076399zkksj2k39nb9zdm8dws79sf"; + revision = "1"; + editedCabalFile = "1bfxyx32dnf4giw4pwanxab0dsca1m5sd3haffpp9snk9jicbafd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125044,8 +126717,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240927"; - sha256 = "116nfcsnnbqcsv7azgrpk24p9nib8zbj96lg51c7xf7fp441xs9k"; + version = "10.20241202"; + sha256 = "10z2mp1yxjbk7ny74w1qvw4f8qc1g2yg4gfr080p9i59xpx1hxg2"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -126036,17 +127709,18 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring , crypton-connection, data-default-class, http-client, http-conduit , http-types, mtl, tasty, tasty-hunit, temporary, text, time - , transformers, tree-diff, unix, unordered-containers, vector + , transformers, tree-diff, unix-compat, unordered-containers + , vector }: mkDerivation { pname = "gitlab-haskell"; - version = "1.0.1.0"; - sha256 = "0xl9xbxfwvpzcvk9hr0549ki404r1ninrrg15nvpyj8blksgdmp8"; + version = "1.0.2.2"; + sha256 = "11pck9gqlnjp7759kdy3qk3xq6wcnj6acyxgdhx40190d1h3sid9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring crypton-connection data-default-class http-client http-conduit http-types mtl temporary text time - transformers unix + transformers unix-compat ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring tasty tasty-hunit text @@ -126686,6 +128360,21 @@ self: { broken = true; }) {inherit (pkgs) glib;}; + "glib-stopgap_0_1_0_1" = callPackage + ({ mkDerivation, base, c-enum, glib, primitive, text }: + mkDerivation { + pname = "glib-stopgap"; + version = "0.1.0.1"; + sha256 = "11sqci1y1vp55zyga2fjhgrn4i95xb3llmvsqg5f3sc9sf1pqswp"; + libraryHaskellDepends = [ base c-enum primitive text ]; + libraryPkgconfigDepends = [ glib ]; + testHaskellDepends = [ base c-enum primitive text ]; + description = "Stopgap package of binding for GLib"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) glib;}; + "glicko" = callPackage ({ mkDerivation, base, containers, data-default, deepseq, hspec , parallel, statistics @@ -126897,13 +128586,13 @@ self: { }: mkDerivation { pname = "globus"; - version = "0.1.2"; - sha256 = "19fyflk5q0a888y8b0lflc9pkmxjxv66x03na503w8k4wp8mc594"; + version = "0.1.3"; + sha256 = "1n2pn21hmmkf982q4gxjb7pli0ln1xc2056bnyy19l4gx4rmvp1x"; libraryHaskellDepends = [ aeson base bytestring effectful http-api-data http-types req tagged text ]; - description = "GLOBUS Data Transfer"; + description = "Globus Data Transfer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -126942,8 +128631,8 @@ self: { pname = "gloss"; version = "1.13.2.2"; sha256 = "09yabwajjw6zsbs8p4hsmfz4a032i81d3vnia5f7rrzszbi9svdn"; - revision = "1"; - editedCabalFile = "04r9lhwxd8bhv7zri3cy5pqcn84ydkdn5pclqppb4dx35z11g871"; + revision = "2"; + editedCabalFile = "1vyh5y3znaazl0q6jmpji5a1pc97yn8wica0lql6yw1w0wq76iii"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -126973,6 +128662,8 @@ self: { pname = "gloss-algorithms"; version = "1.13.0.3"; sha256 = "083rq6p5m0im380c6x0jc3hi59hk94z1nyj08hmvmb3vcszjxra5"; + revision = "1"; + editedCabalFile = "1crvnn54gxn0mr6rcy78xfw8msk9z25ncn8phll709y51ingn086"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; license = lib.licenses.mit; @@ -127139,8 +128830,8 @@ self: { pname = "gloss-rendering"; version = "1.13.1.2"; sha256 = "0zrdqh72gswyn27x43ifhy4q8m7hvmv24b5ki3hyra5yq74njlsm"; - revision = "1"; - editedCabalFile = "0ji8iaj2ldp5qkfrmz4ckh86vwdcq15w6499i9fpnhl0m47sl01g"; + revision = "2"; + editedCabalFile = "107mqdimasvv6vy2r16kk0cz3dqh98m9189q9hd10chk0r5k8ir0"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -127229,10 +128920,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.4"; - sha256 = "1jzh6cdgpiq0lmcfnxkfnzywjv1ny058xsss0b1nrwxra6wcai6x"; - revision = "1"; - editedCabalFile = "0scl65y7lilbqq913qnha2kqy1zkcg5gs4734vlbkcwvzd01f8m2"; + version = "0.1.0.5"; + sha256 = "0z7hpnnnkx3b3bpxx01yr5kb21iimhisb7y55xzyb89h463w7fg7"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -130193,6 +131882,8 @@ self: { pname = "goldplate"; version = "0.2.2.1"; sha256 = "09z937azq3n736gn1sgdy7bxw4nvgsrqicgxdh7x79qng7ks035w"; + revision = "1"; + editedCabalFile = "1ghf2j3hn0gfb4abbb8nk95wfwqx9sn349pchfvad0h07qv2ligf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130336,8 +132027,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.7.0.2"; - sha256 = "1y05vlfn1wrzb6hcfg2wrlwbcz63xr7w6mqb2zq86yww5i1xpkvx"; + version = "0.7.0.3"; + sha256 = "0cj1bkffgn6nrbk3xnplb5v6qsccfhzljvdp0hrvvb5hwh0wd5m9"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -130470,8 +132161,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.7.0.2"; - sha256 = "05dcy6vswh4b5cz4pf0aa3x1fwzv6q35xfv80978ncp6hpzvb1d1"; + version = "0.7.0.3"; + sha256 = "11zmjyz7j41zi7h88gvjzfnky502f81079xnpsx71xhk1nm4b71x"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri @@ -130491,6 +132182,8 @@ self: { pname = "google-translate"; version = "0.5"; sha256 = "09mkhbdfcyw2hiqlijnv0lwlk9rka64hqmx8jhrdyksgsz6hc6gl"; + revision = "1"; + editedCabalFile = "0qx4k19y0n9hvcjjgmklsnq79z3bjahskrc2cv44h68gc5dzy9gj"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers @@ -131028,6 +132721,82 @@ self: { mainProgram = "gps2htmlReport"; }) {}; + "gpu-vulkan" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , gpu-vulkan-middle, hetero-parameter-list + , hetero-parameter-list-with-typelevel-tools, language-spir-v + , mono-traversable, stm, storable-hetero-list, storable-peek-poke + , template-haskell, temporary, text, time, tools-yj + , typelevel-tools-yj + }: + mkDerivation { + pname = "gpu-vulkan"; + version = "0.1.0.162"; + sha256 = "0bmxzkfgdhvvpbgbjbav9klgj81fhn33dhxipiv2acbyq0dpwk6c"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-default gpu-vulkan-middle + hetero-parameter-list hetero-parameter-list-with-typelevel-tools + language-spir-v mono-traversable stm storable-hetero-list + storable-peek-poke template-haskell temporary text time tools-yj + typelevel-tools-yj + ]; + testHaskellDepends = [ + base bytestring containers data-default gpu-vulkan-middle + hetero-parameter-list hetero-parameter-list-with-typelevel-tools + language-spir-v mono-traversable stm storable-hetero-list + storable-peek-poke template-haskell temporary text time tools-yj + typelevel-tools-yj + ]; + description = "Vulkan library"; + license = lib.licenses.bsd3; + }) {}; + + "gpu-vulkan-core" = callPackage + ({ mkDerivation, base, c-enum, c-struct, nowdoc, text + , vulkan-loader + }: + mkDerivation { + pname = "gpu-vulkan-core"; + version = "0.1.0.19"; + sha256 = "1xg400xmp8xxmca9j8wkk4jkd97xfmjrirp1dr6zdmqk46mvrfvl"; + libraryHaskellDepends = [ base c-enum c-struct nowdoc text ]; + libraryPkgconfigDepends = [ vulkan-loader ]; + testHaskellDepends = [ base c-enum c-struct nowdoc text ]; + description = "Thin wrapper for Vulkan API"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) vulkan-loader;}; + + "gpu-vulkan-middle" = callPackage + ({ mkDerivation, base, bytestring, c-enum, containers, data-default + , exception-hierarchy, gpu-vulkan-core, hetero-parameter-list + , language-spir-v, mtl, mtl-misc-yj, ranged-list, stm + , storable-hetero-list, storable-peek-poke, template-haskell, text + , text-misc-yj, typelevel-tools-yj, union-color, uuid + }: + mkDerivation { + pname = "gpu-vulkan-middle"; + version = "0.1.0.68"; + sha256 = "0dhr34f8kg2s9wy7pifnfvrz6i1pns191smh1zgna2hdpy9dm8ff"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-enum containers data-default exception-hierarchy + gpu-vulkan-core hetero-parameter-list language-spir-v mtl + mtl-misc-yj ranged-list stm storable-hetero-list storable-peek-poke + template-haskell text text-misc-yj typelevel-tools-yj union-color + uuid + ]; + testHaskellDepends = [ + base bytestring c-enum containers data-default exception-hierarchy + gpu-vulkan-core hetero-parameter-list language-spir-v mtl + mtl-misc-yj ranged-list stm storable-hetero-list storable-peek-poke + template-haskell text text-misc-yj typelevel-tools-yj union-color + uuid + ]; + description = "Medium wrapper for Vulkan API"; + license = lib.licenses.bsd3; + }) {}; + "gpx-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, filepath, monad-control , old-locale, text, time, void, xml-conduit, xml-types @@ -131207,8 +132976,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.7.1"; - sha256 = "1h4y3gb35ixhwgyw9p1s9fihbm1xfcbrqnassqh11kvcapsfj94x"; + version = "0.7.2"; + sha256 = "1lmi0rfzrs8jncfrqkdcf6x2ysd1j78wbgiap1dvk8ldp7qd1i95"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -131873,19 +133642,19 @@ self: { license = "MPL-2.0 AND BSD-3-Clause"; }) {}; - "graphql_1_3_0_0" = callPackage + "graphql_1_5_0_0" = callPackage ({ mkDerivation, base, conduit, containers, exceptions, hspec , hspec-discover, hspec-expectations, hspec-megaparsec, megaparsec - , parser-combinators, QuickCheck, template-haskell, text - , transformers, unordered-containers, vector + , parser-combinators, QuickCheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "1.3.0.0"; - sha256 = "0clzpnwvy9h71jn2ik0jxghlr7344hgwlxgff0h2imr7mq532adv"; + version = "1.5.0.0"; + sha256 = "1vgvrk225fgn94cmdk5yy6a6d8p10igwx1fbvll94x4izkq57h9y"; libraryHaskellDepends = [ base conduit containers exceptions megaparsec parser-combinators - template-haskell text transformers unordered-containers vector + text transformers unordered-containers vector ]; testHaskellDepends = [ base conduit containers exceptions hspec hspec-expectations @@ -131967,8 +133736,8 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.4.0"; - sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; + version = "1.0.6.0"; + sha256 = "1dm8wq9nyahjf15fx7v25i8jf9rfphl02nqlvf21gs7m0ljgn82k"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -132406,8 +134175,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.3.1"; - sha256 = "14sch5i757zg9zih7gz6s7qdkl0lrzra27qksxwk6bqbkrzdgw95"; + version = "2.0.3.2"; + sha256 = "1vyszhrzmqbhisskcrlglpkrizz1mj8kxkdwcpwpg24v6bd65g72"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -132429,8 +134198,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "1.0.0.2"; - sha256 = "0byq7c26qsi19pbgp5wcaj7a0zvkljc678cjn92x8axi36y8ph8x"; + version = "1.0.0.3"; + sha256 = "1qwd2afiaqyrjbdk3c06l2y4rnvzk734n74lkb2c7ms2njgginbn"; libraryHaskellDepends = [ aeson base bytestring containers hashable scientific semigroups text unordered-containers uuid vector @@ -132453,8 +134222,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "1.0.0.2"; - sha256 = "0liqgmkgivryyrgvc8k76qz62r5x482838rm4jg3diigp1mq2kxj"; + version = "1.0.0.3"; + sha256 = "08kxk1rmahq61iynn47896rw61wc0gnp8js7gkh43lh4lay5q2rz"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -132638,30 +134407,32 @@ self: { }) {}; "grisette" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, doctest, generic-deriving, hashable, hashtables, HUnit - , intern, libBF, loch-th, mtl, parallel, prettyprinter, QuickCheck - , sbv, stm, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, th-abstraction, th-compat - , th-lift-instances, transformers, unordered-containers + ({ mkDerivation, array, async, atomic-primops, base, binary, bytes + , bytestring, cereal, cereal-text, containers, deepseq, doctest + , generic-deriving, hashable, HUnit, libBF, loch-th, mtl, parallel + , prettyprinter, QuickCheck, sbv, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, th-abstraction, th-compat, th-lift-instances, transformers + , unordered-containers, vector }: mkDerivation { pname = "grisette"; - version = "0.8.0.0"; - sha256 = "0q4s9bflngg7bisj1mds8fr1c5wr58di2rll81j9xwppa45n1qb9"; + version = "0.10.0.0"; + sha256 = "0sy54dwd48skqx4vjwnb0665i4pdp736gb7f37c7nq1372y89wmr"; libraryHaskellDepends = [ - array async base bytestring containers deepseq generic-deriving - hashable hashtables intern libBF loch-th mtl parallel prettyprinter - QuickCheck sbv stm template-haskell text th-abstraction th-compat - th-lift-instances transformers unordered-containers + array async atomic-primops base binary bytes bytestring cereal + cereal-text containers deepseq generic-deriving hashable libBF + loch-th mtl parallel prettyprinter QuickCheck sbv stm + template-haskell text th-abstraction th-compat th-lift-instances + transformers unordered-containers vector ]; testHaskellDepends = [ - array async base bytestring containers deepseq doctest - generic-deriving hashable hashtables HUnit intern libBF loch-th mtl - parallel prettyprinter QuickCheck sbv stm template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - th-abstraction th-compat th-lift-instances transformers - unordered-containers + array async atomic-primops base binary bytes bytestring cereal + cereal-text containers deepseq doctest generic-deriving hashable + HUnit libBF loch-th mtl parallel prettyprinter QuickCheck sbv stm + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text th-abstraction th-compat + th-lift-instances transformers unordered-containers vector ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -134255,10 +136026,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.2.0"; - sha256 = "19y2vgy0s4mw47ip3jb78n2gjab2qyp6vyn5fra293srsp25qn5j"; - revision = "4"; - editedCabalFile = "17jcpz9vywj1kjg5llxb2qn0zx3cny4mh8xr478bd6l2m93ywm3b"; + version = "5.5.2.1"; + sha256 = "11jrlghfl9xyssrs4yjcaay825ank1v5sgsys9i4kamrnjpnvagf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135623,6 +137392,29 @@ self: { broken = true; }) {}; + "hackage-revdeps" = callPackage + ({ mkDerivation, alfred-margaret, ansi-terminal, base, bytestring + , Cabal, cabal-install-parsers, containers, filepath + , optparse-applicative, tar, text, time + }: + mkDerivation { + pname = "hackage-revdeps"; + version = "0.1"; + sha256 = "1rc6k7cjcc581cx7nx7q0p5qdfzpc010bacx4w524j6bw1qb2kp1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alfred-margaret base bytestring Cabal containers filepath tar text + time + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring Cabal cabal-install-parsers + containers optparse-applicative time + ]; + description = "List Hackage reverse dependencies"; + license = lib.licenses.bsd3; + }) {}; + "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, Cabal-syntax, containers, cryptohash-sha256 @@ -135840,6 +137632,8 @@ self: { pname = "hackernews"; version = "1.4.0.0"; sha256 = "0ilj91vjnsfdlzhjh35nqrr3c1z7p6qfabvk3xdz6iqzmpcq3ys8"; + revision = "1"; + editedCabalFile = "11idxsl6k8v5g4sw3li1lsdcw08irydmxqg6s4cd8m60a5amxcqi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135912,8 +137706,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.8.5.1"; - sha256 = "0kbrpj38jkrgvha2xp3q4vdf9dnxzmmc3zhjrnqkibl17xg4cz43"; + version = "0.9.0.0"; + sha256 = "0r2qr9qgx9dailqy0ja1v0wki6csjyqbsndnsxggmz53axvrfv1w"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -136411,8 +138205,6 @@ self: { ]; description = "Mailgun REST api interface for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hailgun-send" = callPackage @@ -136430,6 +138222,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "hailgun-send"; + broken = true; }) {}; "hailgun-simple" = callPackage @@ -136445,7 +138238,6 @@ self: { ]; description = "Easy-to-use wrapper for the hailgun package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hails" = callPackage @@ -136653,10 +138445,10 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.2.2"; - sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "3"; - editedCabalFile = "15q1wkjisjgvjn3mq6bj1rfrdsa50r0c37c4g75g905g7zrbmk51"; + version = "4.16.3.0"; + sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; + revision = "1"; + editedCabalFile = "0k38b74zm0a9f5k72xrb3gqnm88sf44831r60j9a86k41283bfkf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136682,38 +138474,35 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; - "hakyll_4_16_3_0" = callPackage - ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup - , bytestring, containers, data-default, deepseq, directory - , file-embed, filepath, fsnotify, hashable, http-conduit - , http-types, lrucache, mtl, network-uri, optparse-applicative - , pandoc, parsec, process, QuickCheck, random, regex-tdfa - , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, util-linux, vector, wai - , wai-app-static, warp, yaml + "hakyll_4_16_4_0" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, bytestring + , containers, data-default, deepseq, directory, file-embed + , filepath, fsnotify, hashable, http-conduit, http-types, lrucache + , mtl, network-uri, optparse-applicative, pandoc, parsec, process + , QuickCheck, random, regex-tdfa, resourcet, scientific, tagsoup + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, time-locale-compat, util-linux + , vector, wai, wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.16.3.0"; - sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; + version = "4.16.4.0"; + sha256 = "1vc39mvnpjarvciji39i7zz109m9wv1w40rwhq4jx2sf2cf7kpr8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary blaze-html blaze-markup bytestring containers - data-default deepseq directory file-embed filepath fsnotify - hashable http-conduit http-types lrucache mtl network-uri + aeson base binary blaze-html bytestring containers data-default + deepseq directory file-embed filepath fsnotify hashable + http-conduit http-types lrucache mtl network-uri optparse-applicative pandoc parsec process random regex-tdfa resourcet scientific tagsoup template-haskell text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml + time-locale-compat vector wai wai-app-static warp yaml ]; executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ aeson base bytestring containers filepath pandoc QuickCheck tagsoup - tasty tasty-golden tasty-hunit tasty-quickcheck text - unordered-containers yaml + tasty tasty-golden tasty-hunit tasty-quickcheck yaml ]; testToolDepends = [ util-linux ]; description = "A static website compiler library"; @@ -136912,8 +138701,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.5"; sha256 = "0xnv0dxfajk4jl0d1a33cjpca21wnrvvm1194jxar58gqp9i0hr5"; - revision = "1"; - editedCabalFile = "168838k3w1aixhd7rq21yrdvrrsp6va4zxmmqkn0j3fhn3fm6a4r"; + revision = "2"; + editedCabalFile = "0lmjwkwaj3kmg8mfll4bf0mj7xnrgqw36qqi0pn6xmgyrdy1nhds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137292,6 +139081,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "half_0_3_2" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, QuickCheck + , template-haskell, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "half"; + version = "0.3.2"; + sha256 = "0f7hgnfy8qpjsjv78gk01di3riwfbrb961msn19qmsplnsgjx68r"; + libraryHaskellDepends = [ base binary deepseq template-haskell ]; + testHaskellDepends = [ + base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Half-precision floating-point"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "half-space" = callPackage ({ mkDerivation, base, call-stack, equational-reasoning , manifolds-core, vector-space @@ -138876,13 +140683,13 @@ self: { mainProgram = "happy"; }) {}; - "happy_2_1_1" = callPackage + "happy_2_1_3" = callPackage ({ mkDerivation, array, base, containers, happy-lib, mtl, process }: mkDerivation { pname = "happy"; - version = "2.1.1"; - sha256 = "05vnv5dila8scra69vqn7gpxwn667nhsv9jx79pnx30444d8p8px"; + version = "2.1.3"; + sha256 = "0jrcphpw026gbq2wlj2hn3z6qrbh5313xx4a772xr109zn9s00nd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers happy-lib mtl ]; @@ -138950,8 +140757,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "happy-lib"; - version = "2.1.1"; - sha256 = "04sq8kzcgp6iv117s8z0469lg5g0qhc1s3grszksv781w71ljpp7"; + version = "2.1.3"; + sha256 = "1gbyqdzw46ydxzahg1s2sqny0my36raxri4w5aj00iw4y6m6arsx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl transformers ]; doHaddock = false; @@ -139521,8 +141328,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.6.0.1"; - sha256 = "1fw5vmlbj4mp1q2a4rkhwmbi1iqf6yz4zcn44z9ffn1him1k1zsk"; + version = "0.6.0.2"; + sha256 = "0k1x373033cbs811i8f8gv2yy4rljp1vs2h0jv6rl91fwjvkhcin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139825,6 +141632,8 @@ self: { pname = "hashable"; version = "1.5.0.0"; sha256 = "0snvrnh9q4arjwk6hdvb4zwb22sh7rlgvr9px7bnqpys3273m2z5"; + revision = "1"; + editedCabalFile = "1vsq3wv397lp208p7zs8fplxdix4jmv688dj4ych4983prn188rg"; libraryHaskellDepends = [ base bytestring containers deepseq filepath ghc-bignum ghc-prim os-string text @@ -140152,6 +141961,8 @@ self: { pname = "hashtables"; version = "1.3.1"; sha256 = "1hsrihk948xfpy14qrhar50b41kp60i1rx8bkadjg1xb4bml0gbg"; + revision = "1"; + editedCabalFile = "1xskh7v0wnnrm1gc6haihahq4gqrk38bzsf2v35aj0gr16sa9g3i"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -140164,6 +141975,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashtables_1_4_1" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, mwc-random, primitive + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "hashtables"; + version = "1.4.1"; + sha256 = "0424hw6n024mcx59swga8ylm34brff0d4v106922cav9g55ka6ah"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + testHaskellDepends = [ + base ghc-prim hashable mwc-random primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector + ]; + description = "Mutable hash tables in the ST monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -141175,6 +143006,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_26_13" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.26.13"; + sha256 = "19md3c83arqk6aaxjxwicf1vldsalyby8cfh6yvynvq25f8apwin"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -141400,8 +143254,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskell-lexer"; - version = "1.1.1"; - sha256 = "0jgkv1api3w7i9j5z01h7qdx2i9cp93h54hp9hj1bw9hk9bdmvn8"; + version = "1.1.2"; + sha256 = "07b8vij3x90px9zm3zmfy55f8zja8wcy8m0kpbpa94gdzxmmpagk"; libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; license = lib.licenses.mit; @@ -143716,8 +145570,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.13"; - sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; + version = "1.5.14"; + sha256 = "1829p5mzgi6zq19h88dcs2cbsafvp7bg7hm3syf444yra9x9brps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144090,31 +145944,46 @@ self: { }) {}; "hasktorch" = callPackage - ({ mkDerivation, backprop, base, dimensions, generic-lens - , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc - , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th - , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl - , QuickCheck, safe-exceptions, singletons, text, time, transformers + ({ mkDerivation, array, async, base, bytestring, Cabal + , cabal-doctest, cassava, constraints, containers, criterion + , data-default-class, deepseq, directory, doctest, finite-typelits + , foldl, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hmatrix, hspec, inline-c + , inline-c-cpp, JuicyPixels, lens-family-core, libtorch-ffi + , libtorch-ffi-helper, lifted-async, matrix, megaparsec + , monad-control, mtl, mwc-random, pipes, pipes-bytestring + , pipes-concurrency, pipes-csv, pipes-group, pipes-safe, primitive + , QuickCheck, random, reflection, safe-exceptions, split, stm + , template-haskell, transformers-base, vector, vector-sized, weigh + , zlib }: mkDerivation { pname = "hasktorch"; - version = "0.0.1.0"; - sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.1"; + sha256 = "0clwhcy72v3p4y4bv4wr6688f5mzxzhxh941j8i3km0x40cyynvw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef - hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc - safe-exceptions singletons text + array async base bytestring cassava constraints containers + data-default-class finite-typelits foldl ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise half inline-c + JuicyPixels lens-family-core libtorch-ffi libtorch-ffi-helper + lifted-async megaparsec monad-control mtl pipes pipes-bytestring + pipes-concurrency pipes-csv pipes-group pipes-safe random + reflection safe-exceptions stm template-haskell transformers-base + vector vector-sized zlib ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - backprop base dimensions generic-lens ghc-typelits-natnormalise - hspec microlens-platform monad-loops mtl QuickCheck singletons time - transformers + async base bytestring data-default-class directory doctest + finite-typelits ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise half hspec inline-c inline-c-cpp + JuicyPixels lens-family-core libtorch-ffi mtl pipes QuickCheck + random reflection safe-exceptions stm vector vector-sized zlib ]; - doHaddock = false; - description = "Torch for tensors and neural networks in Haskell"; + benchmarkHaskellDepends = [ + base criterion deepseq hmatrix libtorch-ffi matrix mwc-random + primitive split vector weigh + ]; + description = "Haskell bindings to libtorch, supporting both typed and untyped tensors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -144526,6 +146395,8 @@ self: { pname = "haskyapi"; version = "0.0.0.2"; sha256 = "1s5krzzmrl8p97xg8p1dimijqmyjbrdfm4i0dpp7jiipj2hzvqyq"; + revision = "1"; + editedCabalFile = "0lglfby1cpaplq53cvsm3n6crdskfm8ck33rwkm6nbzylhszm0f0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144620,19 +146491,19 @@ self: { "hasmtlib" = callPackage ({ mkDerivation, array, attoparsec, base, bitvec, bytestring - , containers, data-default, dependent-map, finite-typelits, lens - , lifted-base, monad-control, mtl, smtlib-backends - , smtlib-backends-process, some, text, unordered-containers - , utf8-string, vector-sized + , constrained-some, containers, data-default, dependent-map + , finite-typelits, lens, lifted-base, monad-control, mtl + , smtlib-backends, smtlib-backends-process, some, text + , unordered-containers, utf8-string, vector-sized }: mkDerivation { pname = "hasmtlib"; - version = "2.7.1"; - sha256 = "0bp183vdhc93sb8nhph3mvcl3v6f7x7hkqbj6ihmrgv2ipvykha1"; + version = "2.8.1"; + sha256 = "0ycx0rcsb8fj5ca99m6dq6zp77nfgpr7fj0p63vzd0a3q5hpb3bw"; libraryHaskellDepends = [ - array attoparsec base bitvec bytestring containers data-default - dependent-map finite-typelits lens lifted-base monad-control mtl - smtlib-backends smtlib-backends-process some text + array attoparsec base bitvec bytestring constrained-some containers + data-default dependent-map finite-typelits lens lifted-base + monad-control mtl smtlib-backends smtlib-backends-process some text unordered-containers utf8-string vector-sized ]; description = "A monad for interfacing with external SMT solvers"; @@ -144716,7 +146587,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_8_1_1" = callPackage + "hasql_1_8_1_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, hspec, hspec-discover @@ -144727,8 +146598,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.8.1.1"; - sha256 = "11k4c4rm77j575nzvizmb0ym1zzjrhbrflayzlb7yjkvjn4m2hww"; + version = "1.8.1.4"; + sha256 = "0m2micp6g9kc1dq7sy3j8lba5iw7p0zn669613bs3an3ni4a7f03"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables iproute mtl @@ -144989,6 +146860,8 @@ self: { pname = "hasql-interpolate"; version = "1.0.1.0"; sha256 = "1i323wc17bw41rpdvn7kk46ipx42v0q0zp27662xgq3khbz52bsf"; + revision = "1"; + editedCabalFile = "0dl8wmjv2xsrnbsh297hpj4c4z8k035s8dpmd71rd7cgbrk4h653"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql iproute megaparsec mtl scientific template-haskell text time @@ -145078,14 +146951,14 @@ self: { mainProgram = "hasql-notifications"; }) {}; - "hasql-notifications_0_2_3_0" = callPackage + "hasql-notifications_0_2_3_1" = callPackage ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec , postgresql-libpq, QuickCheck, text }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.3.0"; - sha256 = "1wr6wgsmgkk834mzadgvpdfj9w9nap262kzaiadhvgy58ffapc4y"; + version = "0.2.3.1"; + sha256 = "1xjnf37b9b4r4q635dgzbfm44vpypppba02s3vjpd2d9krvs0yav"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145161,14 +147034,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_1_2_0_2" = callPackage + "hasql-pool_1_2_0_3" = callPackage ({ mkDerivation, async, base, bytestring, hasql, hspec, random , rerebase, stm, text, time, uuid }: mkDerivation { pname = "hasql-pool"; - version = "1.2.0.2"; - sha256 = "1myasw6zp3979bdkp642fh7b765wdbmwl2hbva9c2qlsa14agdrw"; + version = "1.2.0.3"; + sha256 = "1jjr5wmign12m05f7p3cssmd9qfindv3q9q37j28jk8y74lnqxvy"; libraryHaskellDepends = [ base bytestring hasql stm text time uuid ]; @@ -147490,6 +149363,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "heaps_0_4_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "heaps"; + version = "0.4.1"; + sha256 = "10h3m98fjj114x3nffs0ajllc6z1dbb4g9804j8kq2rd79ka8qw7"; + libraryHaskellDepends = [ base ]; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "heapsize" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap , hashable, hashtables, primitive, transformers @@ -147938,18 +149823,18 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog , http-conduit, lifted-async, lifted-base, mmorph, monad-control - , mtl, network, process, resourcet, stm, tar, tasty, tasty-discover - , tasty-hedgehog, temporary, text, time, transformers - , transformers-base, unliftio, yaml, zlib + , mtl, network, process, resourcet, retry, stm, tar, tasty + , tasty-discover, tasty-hedgehog, temporary, text, time + , transformers, transformers-base, unliftio, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.6.5.0"; - sha256 = "1d0df2jiph7x7kwm4dvaiiwn460my27kj8mlk4s2glxfrxxw3qzw"; + version = "0.6.5.1"; + sha256 = "05fphkd4h1npnab3l2vgc8m1l1jlgjs1apifw5j6d50a2nwkvlp4"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory exceptions filepath hedgehog http-conduit lifted-async lifted-base - mmorph monad-control mtl network process resourcet stm tar + mmorph monad-control mtl network process resourcet retry stm tar temporary text time transformers transformers-base unliftio yaml zlib ]; @@ -148297,8 +150182,8 @@ self: { pname = "hedn"; version = "0.3.0.4"; sha256 = "06js9mcif99k8bfyrsynlg1w5rjygydk5l0qhlrk6pa5v288a7wv"; - revision = "2"; - editedCabalFile = "1ws1l3nkjqlkiy0l1kj4gw8hfz6sqi070i6k8828x4364126njd9"; + revision = "3"; + editedCabalFile = "0yaxvs2ywl1scpp2hjqlivhbxgd7qmn5ilzx8hzz59q1z9x075v4"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -148319,8 +150204,8 @@ self: { pname = "hedn-functor"; version = "0.1.0.0"; sha256 = "1s90az6akimfq6jwiyicns7v34ryp8riymj0ski1sl4ljjm4r4fi"; - revision = "2"; - editedCabalFile = "188w6bm6l235afsidhidcc166b2rv1xmmh1d0jxrdc69z2wdxiyy"; + revision = "3"; + editedCabalFile = "1yzg11lri9i52rw8a462j7xwazb8kbc0j8q3c2c6igzibmdmc1mb"; libraryHaskellDepends = [ base containers hedn recursion-schemes text vector ]; @@ -148347,55 +150232,58 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, data-effects, freer-simple, mtl, tasty - , tasty-discover, tasty-hunit, unliftio + ({ mkDerivation, base, data-effects, mtl, tasty, tasty-discover + , tasty-hunit, unliftio }: mkDerivation { pname = "heftia"; - version = "0.4.0.0"; - sha256 = "19p1l14cg6iqf5bk7pvllpd8z4qhzbpfvfzkvr3rgl7zsz7f28ih"; - libraryHaskellDepends = [ - base data-effects freer-simple mtl unliftio - ]; + version = "0.5.0.0"; + sha256 = "0y906qlpz903gk08gvgzav02adhxqz561aqy9jbrpn5wh3jqshrn"; + libraryHaskellDepends = [ base data-effects mtl unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; - description = "higher-order effects done right"; + description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, eff, effectful - , eveff, extra, freer-simple, fused-effects, ghc-typelits-knownnat - , heftia, hspec, logict, mpeff, mtl, polysemy, tasty, tasty-bench + ({ mkDerivation, base, bytestring, co-log-core, containers + , data-effects, eff, effectful, eveff, extra, filepath + , freer-simple, fused-effects, ghc-typelits-knownnat, heftia, hspec + , logict, mpeff, mtl, polysemy, process, tasty, tasty-bench , tasty-discover, tasty-hspec, text, time, unbounded-delays , unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.4.0.1"; - sha256 = "05zsgfx2kmhgga4zczz2d9k45f1dkk12qvx5cwf2cx9kx44zi0ba"; + version = "0.5.0.0"; + sha256 = "0bhjj3hhvhid4vk1vfzgqpy2wpb725nwlgkc5xqy6y1ihqkf65r5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects ghc-typelits-knownnat heftia time - unbounded-delays unliftio + base bytestring co-log-core containers data-effects + ghc-typelits-knownnat heftia process text time unbounded-delays + unliftio ]; executableHaskellDepends = [ - base containers data-effects extra ghc-typelits-knownnat heftia - text time unbounded-delays unliftio + base bytestring co-log-core containers data-effects extra filepath + ghc-typelits-knownnat heftia process text time unbounded-delays + unliftio ]; testHaskellDepends = [ - base containers data-effects ghc-typelits-knownnat heftia hspec - tasty tasty-hspec time unbounded-delays unliftio + base bytestring co-log-core containers data-effects + ghc-typelits-knownnat heftia hspec process tasty tasty-hspec text + time unbounded-delays unliftio ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - base containers data-effects eff effectful eveff freer-simple - fused-effects ghc-typelits-knownnat heftia logict mpeff mtl - polysemy tasty-bench time unbounded-delays unliftio + base bytestring co-log-core containers data-effects eff effectful + eveff freer-simple fused-effects ghc-typelits-knownnat heftia + logict mpeff mtl polysemy process tasty-bench text time + unbounded-delays unliftio ]; - description = "higher-order effects done right"; + description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; broken = true; @@ -149029,8 +150917,8 @@ self: { }: mkDerivation { pname = "heptapod"; - version = "1.0.0.0"; - sha256 = "0a25m30q0blsmylj2k8qjnp4nkx06fyxdn73p3cbp15y5l128i2h"; + version = "1.1.0.0"; + sha256 = "0s7fq0rh0aax7rfqd49li64n9kw86l8i75mzrkqrpd945xb3zkn9"; libraryHaskellDepends = [ base bytestring entropy time uuid-types ]; @@ -149107,8 +150995,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.4"; - sha256 = "1bslpq4x0kp6k5x7jgcv8hkigp64p5gjgq6d3g60ig0pd35ribwd"; + version = "0.10.5"; + sha256 = "14g5q032f6lnssc8mf01kzcl1gysirj8a6fbcxxpvjpxvdq2675b"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; @@ -149305,8 +151193,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.6.4"; - sha256 = "0l5d4mirf8843svhamq2zwga46y0a4wr1myi3g46l92spljwribc"; + version = "0.3.6.5"; + sha256 = "1pxnvjp38y2yhl4pf0hrk00vmq0lw7k7yiy0i1rymdjvh58x9nqa"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson base bytestring conduit containers directory exceptions @@ -149334,8 +151222,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.6.0"; - sha256 = "02l5bdqxz5gc2zam3n69nbrhny3hkd6pk37sw5qls9wkf5bm3ah7"; + version = "0.3.6.1"; + sha256 = "0phdy6073fz7dfl87xiwryjl5z17s8r2aapjg8c8675wkcgx5qrm"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -149682,6 +151570,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "hetero-parameter-list" = callPackage + ({ mkDerivation, base, data-default, template-haskell }: + mkDerivation { + pname = "hetero-parameter-list"; + version = "0.1.0.19"; + sha256 = "0lbjpk29kvmbrxji68x4f50bmfrwx9v5z28hsm47xihwb1xv2mih"; + libraryHaskellDepends = [ base data-default template-haskell ]; + testHaskellDepends = [ base data-default template-haskell ]; + description = "hetero list with parameter list"; + license = lib.licenses.bsd3; + }) {}; + + "hetero-parameter-list-with-typelevel-tools" = callPackage + ({ mkDerivation, base, hetero-parameter-list, template-haskell + , typelevel-tools-yj + }: + mkDerivation { + pname = "hetero-parameter-list-with-typelevel-tools"; + version = "0.1.0.1"; + sha256 = "03glr22wjr0xpsdsvpzdgqi8cqpzf7481nih1i4m3ma6gn6p4i08"; + libraryHaskellDepends = [ + base hetero-parameter-list template-haskell typelevel-tools-yj + ]; + testHaskellDepends = [ + base hetero-parameter-list template-haskell typelevel-tools-yj + ]; + description = "Hetero parameter list with type level tools"; + license = lib.licenses.bsd3; + }) {}; + "hetero-zip" = callPackage ({ mkDerivation, base, infinite-list }: mkDerivation { @@ -149804,59 +151722,52 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, aeson-optics, array, async - , base, base16, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, Decimal, deepseq, directory, exceptions - , filemanip, filepath, filepattern, free, githash, gmp, haskeline - , here, HUnit, libff, megaparsec, memory, MissingH, monad-par, mtl - , multiset, operational, optics-core, optics-extra, optics-th - , optparse-generic, pretty-hex, process, QuickCheck - , quickcheck-instances, quickcheck-text, regex, regex-tdfa - , restless-git, rosezipper, scientific, secp256k1, smt2-parser - , spawn, spool, stm, system-cxx-std-lib, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, temporary - , text, time, transformers, tree-view, unliftio-core - , unordered-containers, vector, vty, witch, witherable, word-wrap - , wreq + ({ mkDerivation, aeson, aeson-optics, async, base, base16, binary + , bytestring, cereal, containers, cryptonite, data-dword, Decimal + , directory, exceptions, extra, filemanip, filepath, filepattern + , githash, gmp, here, libff, megaparsec, memory, mtl, operational + , optics-core, optics-extra, optics-th, optparse-generic + , pretty-hex, process, QuickCheck, quickcheck-instances, regex + , regex-tdfa, rosezipper, scientific, secp256k1, smt2-parser, spawn + , split, spool, stm, system-cxx-std-lib, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, text, time, transformers, tree-view + , unliftio-core, unordered-containers, vector, witch, with-utf8 + , witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.53.0"; - sha256 = "1kc4sjr4bzp4crfsn65dg9dd4myn1fz1dl54vi391cspxacsm0c2"; + version = "0.54.2"; + sha256 = "0hbivn9008wml61bm8dchqwywc8fk0jmb4ffr18ks2qsscf2kph7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - abstract-par aeson aeson-optics array async base base16 binary - brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory exceptions filemanip filepath filepattern free - haskeline here HUnit megaparsec memory MissingH monad-par mtl - multiset operational optics-core optics-extra optics-th - optparse-generic pretty-hex process QuickCheck quickcheck-instances - quickcheck-text regex regex-tdfa restless-git rosezipper scientific - smt2-parser spawn spool stm system-cxx-std-lib tasty tasty-bench - tasty-expected-failure tasty-hunit tasty-quickcheck temporary text - time transformers tree-view unliftio-core unordered-containers - vector vty witch witherable word-wrap wreq + aeson aeson-optics async base base16 binary bytestring cereal + containers cryptonite data-dword Decimal directory exceptions extra + filemanip filepath filepattern here megaparsec memory mtl + operational optics-core optics-extra optics-th optparse-generic + pretty-hex process QuickCheck quickcheck-instances regex-tdfa + rosezipper scientific smt2-parser spawn split spool stm + system-cxx-std-lib tasty tasty-expected-failure tasty-hunit + tasty-quickcheck template-haskell temporary text transformers + tree-view unliftio-core unordered-containers vector witch + witherable wreq ]; librarySystemDepends = [ gmp libff secp256k1 ]; executableHaskellDepends = [ - aeson async base base16 binary brick bytestring containers - cryptonite data-dword deepseq directory filepath free githash - memory mtl operational optics-core optparse-generic process - QuickCheck quickcheck-text regex-tdfa spawn stm temporary text - unliftio-core unordered-containers vector vty witch + base bytestring data-dword directory filepath githash optics-core + optparse-generic text unliftio-core witch with-utf8 ]; testHaskellDepends = [ - aeson array base base16 binary bytestring containers data-dword - directory exceptions filemanip filepath here HUnit MissingH mtl - operational optics-core optics-extra process QuickCheck - quickcheck-instances regex regex-tdfa smt2-parser spawn stm tasty - tasty-bench tasty-expected-failure tasty-hunit tasty-quickcheck + aeson base base16 binary bytestring containers data-dword directory + exceptions extra filemanip filepath here mtl operational + optics-core optics-extra process QuickCheck quickcheck-instances + regex tasty tasty-expected-failure tasty-hunit tasty-quickcheck temporary text time unliftio-core vector witch witherable ]; benchmarkHaskellDepends = [ - base bytestring containers filemanip filepath here mtl tasty - tasty-bench text unliftio-core + base bytestring containers filemanip filepath tasty tasty-bench + text unliftio-core ]; doHaddock = false; description = "Symbolic EVM Evaluator"; @@ -150591,6 +152502,8 @@ self: { pname = "hgal"; version = "2.0.0.3"; sha256 = "0sla6djvppgrir0kc0h3d558kcrxsk85xi0i7ganragy9vkkr0qx"; + revision = "1"; + editedCabalFile = "1dn493c2ll9sdqhj4dy721gd4pgv9win2s89lqnbfmkkidq34134"; libraryHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ array base containers extra mtl old-time QuickCheck random @@ -151164,24 +153077,6 @@ self: { }) {}; "hi-file-parser" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text - , vector - }: - mkDerivation { - pname = "hi-file-parser"; - version = "0.1.6.0"; - sha256 = "1b13lbgmdb50fw3jkbvj2wq19zmklhxam7rfn7k8bqra2z4kbp2r"; - libraryHaskellDepends = [ - base binary bytestring mtl rio text vector - ]; - testHaskellDepends = [ - base binary bytestring hspec mtl rio text vector - ]; - description = "Parser for GHC's hi files"; - license = lib.licenses.bsd3; - }) {}; - - "hi-file-parser_0_1_7_0" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text , vector }: @@ -151197,7 +153092,6 @@ self: { ]; description = "Parser for GHC's hi files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hi3status" = callPackage @@ -151914,6 +153808,8 @@ self: { pname = "highs-lp"; version = "0.0"; sha256 = "1fx9llq1pfy4ngx99d3i39kkp1pv07wn8qm92abyrmw06qci938r"; + revision = "1"; + editedCabalFile = "0zcg1bf4byiy1y39w13pajdl23r5bd9m3rafrv16rsixnqkldk9v"; libraryHaskellDepends = [ base comfort-array deepseq guarded-allocation linear-programming non-empty QuickCheck storable-record transformers utility-ht @@ -152064,7 +153960,7 @@ self: { mainProgram = "hindent"; }) {}; - "hindent_6_2_0" = callPackage + "hindent_6_2_1" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , criterion, deepseq, Diff, directory, exceptions, filepath , ghc-lib-parser, ghc-lib-parser-ex, hspec, monad-loops, mtl @@ -152073,8 +153969,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "6.2.0"; - sha256 = "05bpsp11cka1l6gmbvsp0fgya8ydx2lh38d3wgq309jf2vmri800"; + version = "6.2.1"; + sha256 = "0vhhbqlf4j17xqwln40z29vsv3r1rb0gd596skd1wkgljm124wrp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -152386,6 +154282,8 @@ self: { pname = "hint"; version = "0.9.0.8"; sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; + revision = "1"; + editedCabalFile = "0f5dwazh10drd9xcqg16p0ja8v7bl0j5k8rgkdnp7b70nhzhk6gb"; libraryHaskellDepends = [ base containers directory exceptions filepath ghc ghc-boot ghc-paths random temporary transformers unix @@ -153493,28 +155391,28 @@ self: { ]; }) {}; - "hledger_1_40" = callPackage + "hledger_1_41" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid - , math-functions, megaparsec, microlens, mtl, process, regex-tdfa - , safe, shakespeare, split, tabular, tasty, temporary, terminfo - , text, text-ansi, time, timeit, transformers, unordered-containers - , utf8-string, utility-ht, wizards + , math-functions, megaparsec, microlens, modern-uri, mtl, process + , regex-tdfa, safe, shakespeare, split, tabular, tasty, temporary + , terminfo, text, text-ansi, time, timeit, transformers + , unordered-containers, utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.40"; - sha256 = "189lbp9dmg9kxik5zg7nk6jm8h5p8hpq1z01zsj8c29x8b8md7b7"; + version = "1.41"; + sha256 = "0ijl7yr6svnwvk6sxm4nq35crksla8ffn3mg2dz8ai9a9gycaslk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default Decimal Diff directory extra filepath githash hashable haskeline - hledger-lib lucid math-functions megaparsec microlens mtl process - regex-tdfa safe shakespeare split tabular tasty temporary terminfo - text text-ansi time timeit transformers unordered-containers - utf8-string utility-ht wizards + hledger-lib lucid math-functions megaparsec microlens modern-uri + mtl process regex-tdfa safe shakespeare split tabular tasty + temporary terminfo text text-ansi time timeit transformers + unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default @@ -153677,8 +155575,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "1"; - editedCabalFile = "1jx773cqq676yvzibp7nzdpmas8i7ahx8j6kfc1sfipk37vz2q0g"; + revision = "4"; + editedCabalFile = "199ga3rcg7nbih9kywryn7apvgfnpd8m3fslf1arbwkkb2wqlaxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153710,8 +155608,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "4"; - editedCabalFile = "0b1dvr9kyzhm8zf60xvqf2hkad8w6m14fr2prm0fry8lq79gc515"; + revision = "5"; + editedCabalFile = "0gqvjqz05ww3rxvkxg8qhqfnbvqgcbj30705aw39y5mzr2yll0gl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153723,6 +155621,25 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; + "hledger-interest_1_6_7" = callPackage + ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time + }: + mkDerivation { + pname = "hledger-interest"; + version = "1.6.7"; + sha256 = "1jirygghw82zi8z160j45qzfcj1l89vckqr7hrv78h3f3pim6np4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal Decimal hledger-lib mtl text time + ]; + description = "computes interest for a given account"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-interest"; + maintainers = [ lib.maintainers.peti ]; + }) {}; + "hledger-irr" = callPackage ({ mkDerivation, base, Cabal, data-default-class, Decimal , hledger-lib, math-functions, text, time @@ -153783,40 +155700,40 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_40" = callPackage + "hledger-lib_1_41" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base - , base-compat, blaze-markup, bytestring, call-stack, cassava - , cassava-megaparsec, cmdargs, colour, containers, data-default - , Decimal, deepseq, directory, doclayout, doctest, extra - , file-embed, filepath, Glob, hashtables, lucid, megaparsec - , microlens, microlens-th, mtl, pager, parser-combinators - , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit - , template-haskell, terminal-size, text, text-ansi, time, timeit - , transformers, uglymemo, unordered-containers, utf8-string + , base-compat, blaze-html, blaze-markup, bytestring, call-stack + , cassava, cassava-megaparsec, cmdargs, colour, containers + , data-default, Decimal, deepseq, directory, doclayout, doctest + , extra, file-embed, filepath, Glob, hashtables, lucid, megaparsec + , microlens, microlens-th, mtl, parser-combinators, pretty-simple + , process, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, terminal-size, text, time, timeit, transformers + , uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.40"; - sha256 = "05kap7kgjlh3y7j6ld0jqih21ad7acxd9cv18h0gb7kbwn7qm8vi"; + version = "1.41"; + sha256 = "1lzqd1jfvgrnmf0jr48nxf779a8cskqd49ira9whb0k5dah4shqw"; libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array base base-compat + aeson aeson-pretty ansi-terminal array base base-compat blaze-html blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout extra file-embed filepath Glob hashtables lucid - megaparsec microlens microlens-th mtl pager parser-combinators - pretty-simple regex-tdfa safe tabular tasty tasty-hunit - template-haskell terminal-size text text-ansi time timeit - transformers uglymemo unordered-containers utf8-string + megaparsec microlens microlens-th mtl parser-combinators + pretty-simple process regex-tdfa safe tabular tasty tasty-hunit + template-haskell terminal-size text time timeit transformers + uglymemo unordered-containers utf8-string ]; testHaskellDepends = [ - aeson aeson-pretty ansi-terminal array base base-compat + aeson aeson-pretty ansi-terminal array base base-compat blaze-html blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout doctest extra file-embed filepath Glob hashtables lucid - megaparsec microlens microlens-th mtl pager parser-combinators - pretty-simple regex-tdfa safe tabular tasty tasty-hunit - template-haskell terminal-size text text-ansi time timeit - transformers uglymemo unordered-containers utf8-string + megaparsec microlens microlens-th mtl parser-combinators + pretty-simple process regex-tdfa safe tabular tasty tasty-hunit + template-haskell terminal-size text time timeit transformers + uglymemo unordered-containers utf8-string ]; description = "A library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; @@ -153875,6 +155792,35 @@ self: { mainProgram = "hledger-stockquotes"; }) {}; + "hledger-stockquotes_0_1_3_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, containers + , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe + , safe-exceptions, scientific, split, tasty, tasty-hedgehog + , tasty-hunit, text, time, unordered-containers, xdg-basedir, yaml + }: + mkDerivation { + pname = "hledger-stockquotes"; + version = "0.1.3.2"; + sha256 = "19iv3n8wg1glmapwj360a4vsfakvza8cgsb3wp8wz2mvcb8f271z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hledger-lib req safe scientific + split text time unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs containers directory raw-strings-qq + safe-exceptions text time xdg-basedir yaml + ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Generate HLedger Price Directives From Daily Stock Quotes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-stockquotes"; + }) {}; + "hledger-ui" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath @@ -153901,7 +155847,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_40" = callPackage + "hledger-ui_1_41" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens @@ -153910,8 +155856,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.40"; - sha256 = "0rvijrnmkc21nllqcbkn6fh51ifp1n1p8qgmckfp5pngqg40vvnz"; + version = "1.41"; + sha256 = "01bzqx26ycz7xp4y3rvrglnf0dasr3b0yhhrmmfnp1x2h18hhsjz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153986,25 +155932,25 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_40" = callPackage - ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup - , bytestring, case-insensitive, clientsession, cmdargs, conduit - , conduit-extra, containers, data-default, Decimal, directory - , extra, filepath, githash, hjsmin, hledger, hledger-lib, hspec - , http-client, http-conduit, http-types, megaparsec, mtl, network - , safe, shakespeare, template-haskell, text, time, transformers - , unix-compat, unordered-containers, utf8-string, wai, wai-cors - , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static, yesod-test + "hledger-web_1_41" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64, blaze-html + , blaze-markup, bytestring, case-insensitive, clientsession + , cmdargs, conduit, conduit-extra, containers, data-default + , Decimal, directory, extra, filepath, githash, hjsmin, hledger + , hledger-lib, hspec, http-client, http-conduit, http-types + , megaparsec, mtl, network, safe, shakespeare, template-haskell + , text, time, transformers, unix-compat, unordered-containers + , utf8-string, wai, wai-cors, wai-extra, wai-handler-launch, warp + , yaml, yesod, yesod-core, yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.40"; - sha256 = "1dsvsgdan7f8zc0z9x4zri2q6ccajvqpjpv18zj488ihknshiwgq"; + version = "1.41"; + sha256 = "0z9q8c6xfkz3i819v12ks21rb4r0c225ba1a6w0h3hk06a11dinw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64 blaze-html blaze-markup bytestring + aeson base base-compat base64 blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra containers data-default Decimal directory extra filepath githash hjsmin hledger hledger-lib hspec http-client http-conduit @@ -154013,8 +155959,8 @@ self: { wai wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form yesod-static yesod-test ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + executableHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base base-compat ]; description = "Web user interface for the hledger accounting system"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -156425,7 +158371,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_14_0" = callPackage + "hoauth2_2_14_1" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, crypton, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -156433,8 +158379,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.14.0"; - sha256 = "1gbdb01iinhcfc91iw2ld4lpvmpcvy6d9r1zl5a58jg16z5v6j8k"; + version = "2.14.1"; + sha256 = "12hynfnmq4w64k2ip9vczx4x0xaas5b4cj3qjxrz2i7cnblkrldm"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers crypton data-default exceptions http-conduit http-types memory microlens text @@ -156455,8 +158401,8 @@ self: { }: mkDerivation { pname = "hoauth2-demo"; - version = "1.12.0"; - sha256 = "03nsjqpaz3b5809rhjc1bqjm84w8srfcbn6ncj42w6g74hb3lmab"; + version = "1.12.1"; + sha256 = "11dc846zcs3pxfa8nk0xl5csfma2yli23gp2j1mx8apcv1iihnj5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -158018,6 +159964,34 @@ self: { mainProgram = "hr"; }) {}; + "horizontal-rule_0_7_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, array, base, constraints + , containers, data-default, exceptions, extra, monad-control, mtl + , optparse-applicative, stm, syb, tasty, tasty-hunit + , template-haskell, terminal-size, text, time, transformers-base + , unliftio + }: + mkDerivation { + pname = "horizontal-rule"; + version = "0.7.0.0"; + sha256 = "0s4hf7frj1gc41v83qk8fgdfn49msmvhcfw6vjklx6w7b6pkfx9x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base terminal-size text ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative text time + ]; + testHaskellDepends = [ + array base constraints containers data-default exceptions extra + monad-control mtl stm syb tasty tasty-hunit template-haskell + transformers-base unliftio + ]; + description = "horizontal rule for the terminal"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hr"; + }) {}; + "horname" = callPackage ({ mkDerivation, base, containers, megaparsec, optparse-applicative , text, these, uniplate, wl-pprint-text @@ -158056,6 +160030,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hosc_0_21" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring, network + , parsec, safe, time, transformers + }: + mkDerivation { + pname = "hosc"; + version = "0.21"; + sha256 = "1m54jnxxb4vb9kf82hadp7m0crfmk2j3mnmbdmls2c1lixyhcx98"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-builder bytestring network parsec safe time + transformers + ]; + description = "Haskell Open Sound Control"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , hosc, json, text, transformers, unordered-containers, utf8-string @@ -158193,6 +160185,7 @@ self: { posix-escape text time typed-process unliftio unordered-containers ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hotel"; }) {}; @@ -158402,25 +160395,6 @@ self: { }) {}; "hp2pretty" = callPackage - ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, optparse-applicative, semigroups, text - }: - mkDerivation { - pname = "hp2pretty"; - version = "0.10"; - sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl - optparse-applicative semigroups text - ]; - description = "generate pretty graphs from heap profiles"; - license = lib.licenses.bsd3; - mainProgram = "hp2pretty"; - }) {}; - - "hp2pretty_0_10_1" = callPackage ({ mkDerivation, array, attoparsec, base, containers, filepath , floatshow, mtl, optparse-applicative, semigroups, text }: @@ -158436,7 +160410,6 @@ self: { ]; description = "generate pretty graphs from heap profiles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hp2pretty"; }) {}; @@ -158905,6 +160878,32 @@ self: { mainProgram = "hpc-lcov"; }) {}; + "hpc-lcov_1_2_0" = callPackage + ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative + , path, path-io, process, tasty, tasty-discover, tasty-golden + , tasty-hunit, text, unordered-containers, yaml + }: + mkDerivation { + pname = "hpc-lcov"; + version = "1.2.0"; + sha256 = "1v4cacn1qwhrdr2szsgqfrghjs8jdwqnr5qvqh5qd3qcn3hc7l56"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers hpc ]; + executableHaskellDepends = [ + aeson base containers hpc optparse-applicative path path-io process + text unordered-containers yaml + ]; + testHaskellDepends = [ + base containers hpc tasty tasty-discover tasty-golden tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Convert HPC output into LCOV format"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpc-lcov"; + }) {}; + "hpc-strobe" = callPackage ({ mkDerivation, base, filepath, hpc }: mkDerivation { @@ -159487,8 +161486,8 @@ self: { }: mkDerivation { pname = "hquantlib"; - version = "0.0.5.1"; - sha256 = "0fbmji48ry3adq9lfpxwfx2q064cbrav8wq2ykaqsszgq9yiysc8"; + version = "0.0.5.2"; + sha256 = "15hi9v31js5j3bj6xhjr4i8y0mj0rshh7fisvkw43qkhccrhznd2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159504,7 +161503,7 @@ self: { test-framework-quickcheck2 ]; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; - license = "LGPL"; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "mctest"; }) {}; @@ -159513,11 +161512,11 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "hquantlib-time"; - version = "0.1.0"; - sha256 = "1a526r49anxri1ms8zyhc4giiidiw5sd5qhpndz6gq3kax3jfja4"; + version = "0.1.1"; + sha256 = "06ixjf69aadb9lpcaqz4nsaznbzazp9ym02kkkxrg382zya47h68"; libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; - license = lib.licenses.lgpl3Plus; + license = "LGPL"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160316,26 +162315,24 @@ self: { "hs-opentelemetry-api" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring - , charset, clock, containers, ghc-prim, hashable, hspec, http-types - , memory, mtl, template-haskell, text, thread-utils-context - , transformers, unliftio-core, unordered-containers, vault, vector - , vector-builder + , charset, clock, hashable, hspec, http-types, memory, mtl + , regex-tdfa, safe-exceptions, template-haskell, text + , thread-utils-context, transformers, unliftio-core + , unordered-containers, vault, vector, vector-builder }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.1.0.0"; - sha256 = "1bi0qzlwn5k9x5j9lvv97m85ckmpvywigy3jajw2rxi8zi84v9s2"; + version = "0.2.0.0"; + sha256 = "0hz7qsdqxv63zaj8pihgm4d7bx665zzzlxihr671wbcfl29wik5n"; libraryHaskellDepends = [ - async attoparsec base binary bytestring charset clock containers - ghc-prim hashable http-types memory mtl template-haskell text - thread-utils-context transformers unliftio-core + async attoparsec base binary bytestring charset clock hashable + http-types memory mtl regex-tdfa safe-exceptions template-haskell + text thread-utils-context transformers unliftio-core unordered-containers vault vector vector-builder ]; testHaskellDepends = [ - async attoparsec base binary bytestring charset clock containers - ghc-prim hashable hspec http-types memory mtl template-haskell text - thread-utils-context transformers unliftio-core - unordered-containers vault vector vector-builder + base hspec mtl text unliftio-core unordered-containers vector + vector-builder ]; description = "OpenTelemetry API for use by libraries for direct instrumentation or wrapper packages"; license = lib.licenses.bsd3; @@ -160360,16 +162357,16 @@ self: { ]; description = "[synopsis]"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-exporter-handle" = callPackage ({ mkDerivation, base, hs-opentelemetry-api, text }: mkDerivation { pname = "hs-opentelemetry-exporter-handle"; - version = "0.0.1.1"; - sha256 = "11b89q6xm2kln4acib26g3bgkqiw3ilpf8vd88kch7zmgprhvccl"; + version = "0.0.1.2"; + sha256 = "180wf114b39sf0ajk4bb95cmj5wj5bkb9ycl64r4cz8rsxibkj4q"; libraryHaskellDepends = [ base hs-opentelemetry-api text ]; - testHaskellDepends = [ base hs-opentelemetry-api text ]; license = lib.licenses.bsd3; }) {}; @@ -160377,36 +162374,28 @@ self: { ({ mkDerivation, async, base, hs-opentelemetry-api, unagi-chan }: mkDerivation { pname = "hs-opentelemetry-exporter-in-memory"; - version = "0.0.1.3"; - sha256 = "0hb8hcq9dhqpnv5v6k48vmlc3d56v24maxj8jqp0w5yakhw59zir"; + version = "0.0.1.4"; + sha256 = "0bri4jd7s7l0li99dalsqvbm6ryqpmzhfps4bl3z20brirf3jr94"; libraryHaskellDepends = [ async base hs-opentelemetry-api unagi-chan ]; - testHaskellDepends = [ - async base hs-opentelemetry-api unagi-chan - ]; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-exporter-otlp" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, clock + ({ mkDerivation, base, bytestring, case-insensitive , hs-opentelemetry-api, hs-opentelemetry-otlp, http-client - , http-conduit, http-types, microlens, mtl, proto-lens, text - , unordered-containers, vector, vector-builder, zlib + , http-conduit, http-types, microlens, proto-lens, text + , unordered-containers, vector, zlib }: mkDerivation { pname = "hs-opentelemetry-exporter-otlp"; - version = "0.0.1.5"; - sha256 = "10da3cxdab4iiw3a7n1wkajw7rqip0wm5sni82ph1i7k0mf83ycv"; + version = "0.1.0.0"; + sha256 = "0qzqr89amg1xvzbmfdnq7dmjd0gybdw668xnpkkj3ig4d96ir03i"; libraryHaskellDepends = [ - base bytestring case-insensitive clock hs-opentelemetry-api + base bytestring case-insensitive hs-opentelemetry-api hs-opentelemetry-otlp http-client http-conduit http-types microlens - mtl proto-lens text unordered-containers vector vector-builder zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive clock hs-opentelemetry-api - hs-opentelemetry-otlp http-client http-conduit http-types microlens - mtl proto-lens text unordered-containers vector vector-builder zlib + proto-lens text unordered-containers vector zlib ]; description = "OpenTelemetry exporter supporting the standard OTLP protocol"; license = lib.licenses.bsd3; @@ -160439,24 +162428,16 @@ self: { "hs-opentelemetry-instrumentation-cloudflare" = callPackage ({ mkDerivation, base, case-insensitive, hs-opentelemetry-api - , hs-opentelemetry-instrumentation-conduit - , hs-opentelemetry-instrumentation-wai, http-types, text - , unordered-containers, wai + , hs-opentelemetry-instrumentation-wai, text, unordered-containers + , wai }: mkDerivation { pname = "hs-opentelemetry-instrumentation-cloudflare"; - version = "0.2.0.0"; - sha256 = "0hynk3sicxnrnnh0lfr0xl4ksw9yynygpz6z6fsyhq0mn7li8404"; + version = "0.2.0.1"; + sha256 = "1vslhh87gff06z33x82xdrnm8gld2xrl1nqj7d6ssyq399jd2m0g"; libraryHaskellDepends = [ base case-insensitive hs-opentelemetry-api - hs-opentelemetry-instrumentation-wai http-types text - unordered-containers wai - ]; - testHaskellDepends = [ - base case-insensitive hs-opentelemetry-api - hs-opentelemetry-instrumentation-conduit - hs-opentelemetry-instrumentation-wai http-types text - unordered-containers wai + hs-opentelemetry-instrumentation-wai text unordered-containers wai ]; license = lib.licenses.bsd3; }) {}; @@ -160465,28 +162446,21 @@ self: { ({ mkDerivation, base, conduit, hs-opentelemetry-api, text }: mkDerivation { pname = "hs-opentelemetry-instrumentation-conduit"; - version = "0.1.0.0"; - sha256 = "1ai8pcag30d64qfiq3vm6pa9knlcn61baxgvx7r453ryyyj283rg"; + version = "0.1.0.1"; + sha256 = "05qi4mhhjbzd0227ba1j65ki6iwznp693sbzlnbnmi9sxy6hd5rs"; libraryHaskellDepends = [ base conduit hs-opentelemetry-api text ]; - testHaskellDepends = [ base conduit hs-opentelemetry-api text ]; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-instrumentation-hspec" = callPackage - ({ mkDerivation, base, hs-opentelemetry-api, hspec, hspec-core, mtl - , resourcet, text, unliftio, vault + ({ mkDerivation, base, hs-opentelemetry-api, hspec-core, mtl, text }: mkDerivation { pname = "hs-opentelemetry-instrumentation-hspec"; - version = "0.0.1.1"; - sha256 = "06hxr45pf8jy9dhl2q2ffaqfypacqvbcns1pj450qybc8rv2n0ay"; + version = "0.0.1.2"; + sha256 = "1h55wh06fv1s5slykdy6achyq9f0ik5k6bm36lb0vcycmgp536l4"; libraryHaskellDepends = [ - base hs-opentelemetry-api hspec hspec-core mtl resourcet text - unliftio vault - ]; - testHaskellDepends = [ - base hs-opentelemetry-api hspec hspec-core mtl resourcet text - unliftio vault + base hs-opentelemetry-api hspec-core mtl text ]; license = lib.licenses.bsd3; }) {}; @@ -160494,24 +162468,17 @@ self: { "hs-opentelemetry-instrumentation-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , hs-opentelemetry-api, hs-opentelemetry-instrumentation-conduit - , http-client, http-client-tls, http-conduit, http-types, text - , unliftio, unordered-containers + , http-client, http-conduit, http-types, text, unliftio + , unordered-containers }: mkDerivation { pname = "hs-opentelemetry-instrumentation-http-client"; - version = "0.1.0.0"; - sha256 = "0hm29fhp1q1qy6dc9iadms5wvwr5ixh96kz7zizi2p2b9p4iqypd"; + version = "0.1.0.1"; + sha256 = "01p5lmvsax5qp3m466d9x6lk74gnd0wwm8584d0z277g5psn7klx"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit hs-opentelemetry-api - hs-opentelemetry-instrumentation-conduit http-client - http-client-tls http-conduit http-types text unliftio - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive conduit hs-opentelemetry-api - hs-opentelemetry-instrumentation-conduit http-client - http-client-tls http-conduit http-types text unliftio - unordered-containers + hs-opentelemetry-instrumentation-conduit http-client http-conduit + http-types text unliftio unordered-containers ]; license = lib.licenses.bsd3; }) {}; @@ -160522,56 +162489,61 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-persistent"; - version = "0.1.0.0"; - sha256 = "1z47mna0n39iqss9s9ddbqa6nqjcdf6zadqmfdhbsybdr71l738j"; + version = "0.1.0.1"; + sha256 = "0gqf5hnzjsj05xba4g5wxzbjs2drxx22yzr8620pn38qbhpwmg8w"; libraryHaskellDepends = [ base clock hs-opentelemetry-api mtl persistent resourcet text unliftio unordered-containers vault ]; - testHaskellDepends = [ - base clock hs-opentelemetry-api mtl persistent resourcet text - unliftio unordered-containers vault - ]; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute - , network, postgresql-libpq, postgresql-simple, text, unliftio - , unordered-containers + , postgresql-libpq, postgresql-simple, text, unliftio + , unliftio-core, unordered-containers }: mkDerivation { pname = "hs-opentelemetry-instrumentation-postgresql-simple"; - version = "0.1.0.0"; - sha256 = "011g3m0gqmrkrcvfa0y5zq0zbwwz33wwwmypi9g2b3a5b2qrgy4x"; + version = "0.2.0.0"; + sha256 = "04jqfxbaqq364l7yg2kf47854m1mlays1cp3llwvckvifw8nniim"; libraryHaskellDepends = [ - base bytestring hs-opentelemetry-api iproute network - postgresql-libpq postgresql-simple text unliftio - unordered-containers + base bytestring hs-opentelemetry-api iproute postgresql-libpq + postgresql-simple text unliftio unliftio-core unordered-containers + ]; + license = lib.licenses.bsd3; + }) {}; + + "hs-opentelemetry-instrumentation-tasty" = callPackage + ({ mkDerivation, async, base, containers, hs-opentelemetry-api + , hs-opentelemetry-sdk, tagged, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-tasty"; + version = "0.1"; + sha256 = "1lj3h5dg4cjcadincwbv0i4ah9q38qk2irp74v3j3b7k7b2x9vg6"; + libraryHaskellDepends = [ + base hs-opentelemetry-api tagged tasty text ]; testHaskellDepends = [ - base bytestring hs-opentelemetry-api iproute network - postgresql-libpq postgresql-simple text unliftio - unordered-containers + async base containers hs-opentelemetry-api hs-opentelemetry-sdk + tasty tasty-hunit text ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-wai" = callPackage - ({ mkDerivation, base, bytestring, hs-opentelemetry-api, http-types - , iproute, network, text, vault, wai + ({ mkDerivation, base, hs-opentelemetry-api, http-types, iproute + , network, text, unordered-containers, vault, wai }: mkDerivation { pname = "hs-opentelemetry-instrumentation-wai"; - version = "0.1.0.0"; - sha256 = "161xasgy82c0vzk38dz8441f5h90w05jjb1v3yzaarhkj6zm29cb"; + version = "0.1.1.0"; + sha256 = "0ip31c8scjbakxdqck88vakrm5szk5xv9a4k2pvvwxnijxn2bp64"; libraryHaskellDepends = [ - base bytestring hs-opentelemetry-api http-types iproute network - text vault wai - ]; - testHaskellDepends = [ - base bytestring hs-opentelemetry-api http-types iproute network - text vault wai + base hs-opentelemetry-api http-types iproute network text + unordered-containers vault wai ]; description = "WAI instrumentation middleware for OpenTelemetry"; license = lib.licenses.bsd3; @@ -160579,54 +162551,43 @@ self: { "hs-opentelemetry-instrumentation-yesod" = callPackage ({ mkDerivation, base, hs-opentelemetry-api - , hs-opentelemetry-instrumentation-wai, microlens, mtl - , template-haskell, text, unliftio, unordered-containers, wai - , yesod-core + , hs-opentelemetry-instrumentation-wai, microlens, template-haskell + , text, unliftio, unordered-containers, wai, yesod-core }: mkDerivation { pname = "hs-opentelemetry-instrumentation-yesod"; - version = "0.1.0.0"; - sha256 = "1m3ph1g2rkg0a45zrfq5781gqjc5nk5ppg107b1lqsnngb3r659r"; + version = "0.1.1.0"; + sha256 = "09r6493sqxjy0q4dfh6s42xbx3ng53g4laywn0989ag2fnr3jz09"; libraryHaskellDepends = [ base hs-opentelemetry-api hs-opentelemetry-instrumentation-wai - microlens mtl template-haskell text unliftio unordered-containers - wai yesod-core - ]; - testHaskellDepends = [ - base hs-opentelemetry-api hs-opentelemetry-instrumentation-wai - microlens mtl template-haskell text unliftio unordered-containers - wai yesod-core + microlens template-haskell text unliftio unordered-containers wai + yesod-core ]; description = "Yesod middleware for providing OpenTelemetry instrumentation"; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-otlp" = callPackage - ({ mkDerivation, base, proto-lens, proto-lens-runtime }: + ({ mkDerivation, base, proto-lens-runtime }: mkDerivation { pname = "hs-opentelemetry-otlp"; - version = "0.0.1.0"; - sha256 = "1hlflmr51lz4pbxxmlmp2rb5p4lcj09fhry41rv52nmk9iim4qr0"; - libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; + version = "0.1.0.0"; + sha256 = "1g9accvfcdn86m2y18imnmj4n73pbs1mncwg4s5jni1fzjg9f45r"; + libraryHaskellDepends = [ base proto-lens-runtime ]; description = "OpenTelemetry protocol buffer modules generated for the OTLP protocol by the proto-lens package"; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-propagator-b3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hs-opentelemetry-api - , http-types, memory, primitive, text + , http-types, text }: mkDerivation { pname = "hs-opentelemetry-propagator-b3"; - version = "0.0.1.1"; - sha256 = "0ncv85hsal7vqhfb0z4il0x8lwjibjji22japsi45w9fkkqhs8wd"; + version = "0.0.1.2"; + sha256 = "1hb1ls0xykp1b2vnjwrfxj33plx24f794s7wp09693d6hwaqxx84"; libraryHaskellDepends = [ - attoparsec base bytestring hs-opentelemetry-api http-types memory - primitive text - ]; - testHaskellDepends = [ - attoparsec base bytestring hs-opentelemetry-api http-types memory - primitive text + attoparsec base bytestring hs-opentelemetry-api http-types text ]; description = "Trace propagation via HTTP headers following the b3 tracestate spec"; license = lib.licenses.bsd3; @@ -160634,18 +162595,15 @@ self: { "hs-opentelemetry-propagator-datadog" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq - , hs-opentelemetry-api, hs-opentelemetry-sdk, hspec, hspec-discover - , http-types, pretty-hex, primitive, QuickCheck, text + , hs-opentelemetry-api, hspec, hspec-discover, http-types + , pretty-hex, primitive, QuickCheck, text }: mkDerivation { pname = "hs-opentelemetry-propagator-datadog"; - version = "0.0.0.0"; - sha256 = "0mpf3jl741336fhljhgdgfxvpxyblcyqphgs7kp8hv6d6nmwyl19"; - revision = "1"; - editedCabalFile = "0bfvcfmyq0npwjnzh0v9kcv2ghhhnnr2wcw5d65bb59vfwhw7gys"; + version = "0.0.1.0"; + sha256 = "0sxfcswmwf4bnsyj0d67j32yi32gwhm4c6fs9mcl2wnax2vdwk7n"; libraryHaskellDepends = [ - base bytestring hs-opentelemetry-api hs-opentelemetry-sdk - http-types primitive text + base bytestring hs-opentelemetry-api http-types primitive text ]; testHaskellDepends = [ base bytestring hs-opentelemetry-api hspec pretty-hex primitive @@ -160663,17 +162621,14 @@ self: { "hs-opentelemetry-propagator-w3c" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hs-opentelemetry-api - , http-types, text + , http-types }: mkDerivation { pname = "hs-opentelemetry-propagator-w3c"; - version = "0.0.1.3"; - sha256 = "0n99kmy2ka3rmwhn56dqzsszhpv7phgcmkqng7drvr6qi5jzlfpz"; + version = "0.0.1.4"; + sha256 = "0f0fagrsyxhpd2qsbgzkgxzx5hzasplly12c2qjdd8g2ylh8szw1"; libraryHaskellDepends = [ - attoparsec base bytestring hs-opentelemetry-api http-types text - ]; - testHaskellDepends = [ - attoparsec base bytestring hs-opentelemetry-api http-types text + attoparsec base bytestring hs-opentelemetry-api http-types ]; description = "Trace propagation via HTTP headers following the w3c tracestate spec"; license = lib.licenses.bsd3; @@ -160682,30 +162637,29 @@ self: { "hs-opentelemetry-sdk" = callPackage ({ mkDerivation, async, base, bytestring, clock , hs-opentelemetry-api, hs-opentelemetry-exporter-otlp - , hs-opentelemetry-propagator-b3, hs-opentelemetry-propagator-w3c - , hspec, http-types, network-bsd, random, stm, text, transformers - , unagi-chan, unix, unordered-containers, vector, vector-builder + , hs-opentelemetry-propagator-b3 + , hs-opentelemetry-propagator-datadog + , hs-opentelemetry-propagator-w3c, hspec, http-types, network-bsd + , random, stm, text, unagi-chan, unix, unix-compat + , unordered-containers, vector, vector-builder }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.6"; - sha256 = "042cb38dilf965dmyapv6c09v70520lrl389yv98yk1wwflkyrhi"; + version = "0.1.0.0"; + sha256 = "08zjfvfnsgsxc73jlgjizr8m2w152hny0myns4m78sjzj53733x1"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-b3 - hs-opentelemetry-propagator-w3c http-types network-bsd random stm - text transformers unagi-chan unix unordered-containers vector - vector-builder + hs-opentelemetry-propagator-datadog hs-opentelemetry-propagator-w3c + http-types network-bsd random stm text unagi-chan unix unix-compat + unordered-containers vector vector-builder ]; testHaskellDepends = [ - async base bytestring clock hs-opentelemetry-api - hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-b3 - hs-opentelemetry-propagator-w3c hspec http-types network-bsd random - stm text transformers unagi-chan unix unordered-containers vector - vector-builder + base clock hs-opentelemetry-api hspec text unordered-containers ]; description = "OpenTelemetry SDK for use in applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-utils-exceptions" = callPackage @@ -160714,35 +162668,30 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-utils-exceptions"; - version = "0.2.0.0"; - sha256 = "1jcczl8q78d1fz32s0sb6g8qr4s70zdwn13p789w7m5xvycjdvrg"; + version = "0.2.0.1"; + sha256 = "1ccazld2gd4ql7x9nkc8npf0v588swcwccvrxs6xkph8ds33pfy7"; libraryHaskellDepends = [ base exceptions hs-opentelemetry-api hs-opentelemetry-sdk text ]; - testHaskellDepends = [ - base exceptions hs-opentelemetry-api hs-opentelemetry-sdk text - ]; + testHaskellDepends = [ base ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-vendor-honeycomb" = callPackage ({ mkDerivation, base, bytestring, honeycomb, hs-opentelemetry-api - , hspec, hspec-core, hspec-discover, hspec-expectations, mtl, text - , time, transformers, unordered-containers, uri-bytestring + , hspec, hspec-discover, mtl, text, time, transformers + , unordered-containers, uri-bytestring }: mkDerivation { pname = "hs-opentelemetry-vendor-honeycomb"; - version = "0.0.1.1"; - sha256 = "0g3c6h8z1gcxxn4xm7vaif564knz0122y8jwmjy1sw4nmn74123x"; + version = "0.0.1.2"; + sha256 = "1q0ckazz17mvl6h8k0di0kfvq377xxsbi5aghsv6wyzpb2fq7brf"; libraryHaskellDepends = [ base bytestring honeycomb hs-opentelemetry-api mtl text time transformers unordered-containers uri-bytestring ]; - testHaskellDepends = [ - base bytestring honeycomb hs-opentelemetry-api hspec hspec-core - hspec-expectations mtl text time transformers unordered-containers - uri-bytestring - ]; + testHaskellDepends = [ base hs-opentelemetry-api hspec time ]; testToolDepends = [ hspec-discover ]; description = "Optional OpenTelemetry integration for Honeycomb"; license = lib.licenses.bsd3; @@ -161086,14 +163035,18 @@ self: { }) {}; "hs-tango" = callPackage - ({ mkDerivation, base, derive-storable, tango, text, unliftio }: + ({ mkDerivation, base, derive-storable, http-media, lucid2, servant + , servant-server, tango, text, unliftio, warp + }: mkDerivation { pname = "hs-tango"; - version = "1.0.0"; - sha256 = "0ah4xp3vrarq8kpvgwk78hck8bj9w0fk3d6m5vi28cy8dq62qb5c"; + version = "2.0.0"; + sha256 = "1d78icf12k7zj1v4gnms8ddfj1ji6kzcx0r1jws4cri0y4rzwdlk"; libraryHaskellDepends = [ base derive-storable text unliftio ]; libraryPkgconfigDepends = [ tango ]; - benchmarkHaskellDepends = [ base text ]; + benchmarkHaskellDepends = [ + base http-media lucid2 servant servant-server text warp + ]; description = "Bindings to the Tango Controls system"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -161638,8 +163591,8 @@ self: { }: mkDerivation { pname = "hsblst"; - version = "0.0.3"; - sha256 = "0pf35cyb0m06frcb3ralzq3wzmhb3r5zyzx330gxkz3gw6b5qwig"; + version = "0.0.4"; + sha256 = "13dlz8am20np31bq31z596yam6w1rb0fdzlg3zwwvm6wyjh6b8sg"; libraryHaskellDepends = [ base deepseq memory ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -161682,8 +163635,8 @@ self: { }: mkDerivation { pname = "hsc3"; - version = "0.20"; - sha256 = "1pi2zzcz6xrj5w0ql5g7z6qf2vbchixc871if2yqna8wndakhcc8"; + version = "0.21"; + sha256 = "06rxvhravms34w4zfazvxsxh4n8ysnrcbfv3y5028yrckingihlv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 @@ -161692,6 +163645,8 @@ self: { ]; description = "Haskell SuperCollider"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsc3-auditor" = callPackage @@ -162240,8 +164195,8 @@ self: { }: mkDerivation { pname = "hscim"; - version = "0.4.0.2"; - sha256 = "1plcbwhl1xl7rgn91q2n3829mvk33gqzsjf3y0bhlkyyd1rmz2fx"; + version = "0.4.0.6"; + sha256 = "1s4r7193zms8rvrj8fyr5fh8sss6g8bbr05im4c0myyvqsn7xh6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162251,7 +164206,6 @@ self: { network-uri retry scientific servant servant-client servant-client-core servant-server stm stm-containers string-conversions template-haskell text time uuid wai wai-extra - warp ]; executableHaskellDepends = [ base email-validate network-uri stm stm-containers time warp @@ -162804,6 +164758,37 @@ self: { broken = true; }) {}; + "hsftp" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, directory + , filepath, filepath-bytestring, libssh2, mtl, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, temporary, time, yaml + }: + mkDerivation { + pname = "hsftp"; + version = "1.3.1"; + sha256 = "0027bmn11fl3lbyd4aw77w5b4xdf53izpxnnpp1qnwpxd8j92w82"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cmdargs directory filepath + filepath-bytestring libssh2 mtl time yaml + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs directory filepath + filepath-bytestring libssh2 mtl time yaml + ]; + testHaskellDepends = [ + aeson base bytestring cmdargs directory filepath + filepath-bytestring libssh2 mtl tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary time yaml + ]; + description = "A SFTP client tool for secure file transfer operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsftp"; + broken = true; + }) {}; + "hsgnutls" = callPackage ({ mkDerivation, base, bytestring, gcrypt, gnutls, mtl, old-time }: mkDerivation { @@ -163944,8 +165929,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.11.9"; - sha256 = "16rh30v2mx01yi72k8kiwmwgnv98xv59d9n6ap8jpyn7p96nmsir"; + version = "2.11.10"; + sha256 = "1c9m16fq15q7zad4q4ji1mw138vapbbzby0dwc2zqf9sahd5vvl4"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -163959,8 +165944,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.9"; - sha256 = "1hzv4q63yd60kypnil3hmsf8v92ig2ankafhavd0jf5hgdjd2wnk"; + version = "2.11.10"; + sha256 = "1wi8jfia2gxd9xx3748rkwvjqaqwwxnab87c97nhff3ynaq5sx2b"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -164058,25 +166043,25 @@ self: { "hspec-core" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans - , call-stack, deepseq, directory, filepath, haskell-lexer - , hspec-expectations, hspec-meta, HUnit, process, QuickCheck - , quickcheck-io, random, silently, stm, temporary, tf-random, time - , transformers + , call-stack, containers, deepseq, directory, filepath + , haskell-lexer, hspec-expectations, hspec-meta, HUnit, process + , QuickCheck, quickcheck-io, random, silently, stm, temporary + , tf-random, time, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.11.9"; - sha256 = "0qzzwyx71741v53qd9pah5bqq8md3mj0l6ykaw3d4816c2np5wdi"; + version = "2.11.10"; + sha256 = "1glyrb3lw0290a06jj5ig2l69jawfrhhaacqfaniziwl4psd3giq"; libraryHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - haskell-lexer hspec-expectations HUnit process QuickCheck + ansi-terminal array base call-stack containers deepseq directory + filepath haskell-lexer hspec-expectations HUnit process QuickCheck quickcheck-io random stm tf-random time transformers ]; testHaskellDepends = [ - ansi-terminal array base base-orphans call-stack deepseq directory - filepath haskell-lexer hspec-expectations hspec-meta HUnit process - QuickCheck quickcheck-io random silently stm temporary tf-random - time transformers + ansi-terminal array base base-orphans call-stack containers deepseq + directory filepath haskell-lexer hspec-expectations hspec-meta + HUnit process QuickCheck quickcheck-io random silently stm + temporary tf-random time transformers ]; testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -164133,8 +166118,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.11.9"; - sha256 = "054l0k6rn7n1mm3ivhvv00zmqdkdnrp91h5l2wy6sbibrvrl8rhp"; + version = "2.11.10"; + sha256 = "001j5jr0iyskicn893lfgidh99fz8g5v3l5jv13yvq2hl9xi2cvk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -164500,25 +166485,25 @@ self: { }) {}; "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq - , directory, filepath, haskell-lexer, hspec-expectations, HUnit - , process, QuickCheck, quickcheck-io, random, stm, tf-random, time - , transformers + ({ mkDerivation, ansi-terminal, array, base, call-stack, containers + , deepseq, directory, filepath, haskell-lexer, hspec-expectations + , HUnit, process, QuickCheck, quickcheck-io, random, stm, tf-random + , time, transformers }: mkDerivation { pname = "hspec-meta"; - version = "2.11.9"; - sha256 = "09cl2dknj548zzmdfx1pyd27jywgcr4000hf1rscn85b4r2riymm"; + version = "2.11.10"; + sha256 = "10iq35f6j4lrk4cxyr1gm0f0zxd2ndnzng0v4lcl6i33fnfjf3n2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - haskell-lexer hspec-expectations HUnit process QuickCheck + ansi-terminal array base call-stack containers deepseq directory + filepath haskell-lexer hspec-expectations HUnit process QuickCheck quickcheck-io random stm tf-random time transformers ]; executableHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - haskell-lexer hspec-expectations HUnit process QuickCheck + ansi-terminal array base call-stack containers deepseq directory + filepath haskell-lexer hspec-expectations HUnit process QuickCheck quickcheck-io random stm tf-random time transformers ]; description = "A version of Hspec which is used to test Hspec itself"; @@ -166582,6 +168567,24 @@ self: { license = lib.licenses.agpl3Plus; }) {}; + "htree_0_2_0_0" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck + , quickcheck-instances, template-haskell, th-compat + }: + mkDerivation { + pname = "htree"; + version = "0.2.0.0"; + sha256 = "1q3piv0281whrz2nixl8wk4ryzpkd6p5isyw5by1y85pn16m60jf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hspec QuickCheck quickcheck-instances + template-haskell th-compat + ]; + description = "a library to build and work with heterogeneous, type level indexed rose trees"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "hts" = callPackage ({ mkDerivation, base, hmt, xml }: mkDerivation { @@ -166762,8 +168765,8 @@ self: { pname = "http-api-data-qq"; version = "0.1.0.0"; sha256 = "1lvfdbprdwq09k1wkjfvvkpi79053dc4kzkv4g1cx94qb1flbd7a"; - revision = "5"; - editedCabalFile = "0j7iv1br4ijawc1l85zdh7h9i005qnqbm2gamrca09alv3m9m72v"; + revision = "6"; + editedCabalFile = "06bl99wxwb9g5rnkjqgbmb6187gjr821falc78daqc7c9vdp2nv5"; libraryHaskellDepends = [ base http-api-data template-haskell text ]; @@ -166833,6 +168836,36 @@ self: { license = lib.licenses.mit; }) {}; + "http-client_0_7_18" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , deepseq, directory, exceptions, filepath, ghc-prim, hspec + , hspec-discover, http-types, iproute, mime-types, monad-control + , network, network-uri, random, stm, streaming-commons, text, time + , transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.7.18"; + sha256 = "15ilhyxqsna6bwi3gklnxfmpaxcb56y3l3z62l3bsk02jvbb724h"; + libraryHaskellDepends = [ + array async base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie deepseq exceptions filepath + ghc-prim http-types iproute mime-types network network-uri random + stm streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + cookie deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "An HTTP client engine"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -167059,18 +169092,18 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , crypton, crypton-connection, data-default-class, exceptions - , gauge, hspec, http-client, http-types, memory, network - , network-uri, text, tls, transformers + , crypton, crypton-connection, data-default, exceptions, gauge + , hspec, http-client, http-types, memory, network, network-uri + , text, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.6.3"; - sha256 = "15chmlnq0nk2kxhk65r9xdjkzl94k0axcml89a5qkdiffwyzrp1q"; + version = "0.3.6.4"; + sha256 = "18qqzif376hv5lqv1c7sp4b90mq5cyfhybip472j9fcaxrph0mkp"; libraryHaskellDepends = [ base bytestring case-insensitive containers crypton - crypton-connection data-default-class exceptions http-client - http-types memory network network-uri text tls transformers + crypton-connection data-default exceptions http-client http-types + memory network network-uri text tls transformers ]; testHaskellDepends = [ base crypton-connection hspec http-client http-types @@ -167119,16 +169152,16 @@ self: { "http-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, cookie, crypton-connection, data-default-class - , hspec, http-client, http-client-tls, http-types, HUnit, mtl - , network, resourcet, streaming-commons, temporary, text, time, tls + , conduit-extra, cookie, crypton-connection, data-default, hspec + , http-client, http-client-tls, http-types, HUnit, mtl, network + , resourcet, streaming-commons, temporary, text, time, tls , transformers, unliftio, unliftio-core, utf8-string, wai , wai-conduit, warp, warp-tls }: mkDerivation { pname = "http-conduit"; - version = "2.3.9"; - sha256 = "0mg9l71lcilgc5mfc6syw71hqk17jc7f880s63zrwvfxnhc2cvi9"; + version = "2.3.9.1"; + sha256 = "1bs12v0vh4ik87imfp4xrvpyr3kb3dm4m8y8h1djlcyjxhans10k"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet @@ -167137,9 +169170,9 @@ self: { testHaskellDepends = [ aeson attoparsec-aeson base blaze-builder bytestring case-insensitive conduit conduit-extra cookie crypton-connection - data-default-class hspec http-client http-types HUnit network - resourcet streaming-commons temporary text time tls transformers - unliftio utf8-string wai wai-conduit warp warp-tls + data-default hspec http-client http-types HUnit network resourcet + streaming-commons temporary text time tls transformers unliftio + utf8-string wai wai-conduit warp warp-tls ]; doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; @@ -168006,36 +170039,36 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_3_4" = callPackage + "http2_5_3_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , criterion, crypton, directory, filepath, Glob, hspec , hspec-discover, http-semantics, http-types, iproute, network , network-byte-order, network-control, network-run, random, stm - , text, time-manager, typed-process, unix-time, unliftio + , text, time-manager, typed-process, unix-time , unordered-containers, utf8-string, vector }: mkDerivation { pname = "http2"; - version = "5.3.4"; - sha256 = "006l2asgkcgdiyknl363n3wfdmaxbqnnf9kls4ljqxvc677l2jj3"; + version = "5.3.9"; + sha256 = "0wcv9ziz0865j66avlax7f4i9l5k7ydcn96bacy78snmvcciblqf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers http-semantics http-types iproute network network-byte-order - network-control stm time-manager unix-time unliftio utf8-string + network-control stm time-manager unix-time utf8-string ]; testHaskellDepends = [ aeson aeson-pretty async base base16-bytestring bytestring crypton directory filepath Glob hspec http-semantics http-types network - network-byte-order network-run random text typed-process unliftio + network-byte-order network-run random text typed-process unordered-containers vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array base bytestring case-insensitive containers criterion - network-byte-order stm unliftio + network-byte-order stm ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; @@ -168157,20 +170190,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store - , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls - , utf8-string + , crypton-x509-validation, http2, network, network-control + , network-run, recv, time-manager, tls, utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.3"; - sha256 = "0pfjybiqiqafpbm9cr8dx4b2914l0n62xd36aw5jm8d9x8xsqdzy"; + version = "0.4.5"; + sha256 = "0kc7g8ldgm40fsh73r881pxjb87x0m00xnjd0zsl0baaa85f7r4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring crypton-x509-store crypton-x509-validation - data-default-class http2 network network-control network-run recv - time-manager tls utf8-string + base bytestring crypton-x509-store crypton-x509-validation http2 + network network-control network-run recv time-manager tls + utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -168183,23 +170215,23 @@ self: { , bytestring, case-insensitive, conduit, conduit-extra, containers , crypton, hspec, hspec-discover, http-semantics, http-types, http2 , iproute, network, network-byte-order, quic, QuickCheck, sockaddr - , stm, time-manager, tls, unliftio + , stm, time-manager, tls }: mkDerivation { pname = "http3"; - version = "0.0.18"; - sha256 = "1wmh13irvsfkbzmg1xh5p68xqhvs21hr9dk3dk845xdn269vxidq"; + version = "0.0.22"; + sha256 = "1w9zrzxj1n0j2y529chhfnbxbqrflvqhpifizyb9v192fgkzwiy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers http-semantics http-types http2 network network-byte-order quic - sockaddr stm time-manager unliftio + sockaddr stm time-manager ]; testHaskellDepends = [ - attoparsec base base16-bytestring bytestring conduit conduit-extra - crypton hspec http-semantics http-types http2 iproute network quic - QuickCheck stm tls unliftio + async attoparsec base base16-bytestring bytestring conduit + conduit-extra crypton hspec http-semantics http-types http2 iproute + network quic QuickCheck stm tls ]; testToolDepends = [ hspec-discover ]; description = "HTTP/3 library"; @@ -169621,27 +171653,27 @@ self: { }) {}; "hw-json" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec - , attoparsec-aeson, base, bits-extra, bytestring, criterion - , directory, dlist, doctest, doctest-discover, generic-lens - , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-json-simple-cursor - , hw-json-standard-cursor, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap - , optparse-applicative, scientific, text, transformers - , unordered-containers, vector, word8 + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bits-extra, bytestring, criterion, directory, dlist, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd + , hw-json-simple-cursor, hw-json-standard-cursor, hw-mquery + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, hw-simd + , lens, mmap, optparse-applicative, prettyprinter, scientific, text + , transformers, unordered-containers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "1.3.2.5"; - sha256 = "0nwwyk7x26xrx3cqnwy6gv1gpjnmw69mfyjqgvky3bdgf9lxncrb"; + version = "1.3.3.0"; + sha256 = "1kqwz2wh0bqq91amqwljilb6grmq943z874b1avq6z1mxvxmaf9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec attoparsec-aeson base bits-extra - bytestring dlist hw-balancedparens hw-bits hw-json-simple-cursor + aeson attoparsec attoparsec-aeson base bits-extra bytestring dlist + hw-balancedparens hw-bits hw-json-simple-cursor hw-json-standard-cursor hw-mquery hw-parser hw-prim hw-rankselect - hw-rankselect-base hw-simd mmap scientific text vector word8 + hw-rankselect-base hw-simd mmap prettyprinter scientific text + vector word8 ]; executableHaskellDepends = [ aeson base bytestring dlist generic-lens hw-balancedparens @@ -169921,19 +171953,16 @@ self: { }) {}; "hw-mquery" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, doctest - , doctest-discover, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, lens + ({ mkDerivation, base, dlist, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, hw-hspec-hedgehog, lens, prettyprinter }: mkDerivation { pname = "hw-mquery"; - version = "0.2.1.1"; - sha256 = "1jdmgg0y04xl18vkdjwynb48wdl58kkzsw062v2cv65mkjhcvf0l"; - revision = "1"; - editedCabalFile = "16832r95lljph5vf33l9f544m8q9c3dx9b94wxmjjsl6z3bymmdc"; + version = "0.2.1.2"; + sha256 = "0zdn8rsjcvnk5x12l27nsryi3fhng9w7f67babkjmvfj09m3z1mx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; + libraryHaskellDepends = [ base dlist lens prettyprinter ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base dlist doctest doctest-discover hedgehog hspec @@ -170026,21 +172055,21 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, bytestring, contravariant, Diff, directory, exceptions , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens - , mtl, network, polysemy, polysemy-log, polysemy-plugin + , microlens, mtl, network, polysemy, polysemy-log, polysemy-plugin , polysemy-time, prettyprinter, process, resourcet, stm, tasty , tasty-discover, tasty-hedgehog, temporary, testcontainers, text , time, transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.3.0.0"; - sha256 = "16cgg0z13f46hqp0abbv70pk6mw1lhckf2kf0hz994mjbprxrp2a"; + version = "0.3.1.0"; + sha256 = "1mgw1mika0rjgdj722k58sblb1q2yknapybxqdb8jqqwr7301bvz"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit - hw-prelude lens mtl network polysemy polysemy-log polysemy-plugin - polysemy-time prettyprinter process resourcet stm temporary - testcontainers text time transformers ulid unliftio yaml + hw-prelude lens microlens mtl network polysemy polysemy-log + polysemy-plugin polysemy-time prettyprinter process resourcet stm + temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ amazonka-s3 base filepath generic-lens hw-prelude lens polysemy @@ -170055,16 +172084,18 @@ self: { }) {}; "hw-prelude" = callPackage - ({ mkDerivation, async, base, bytestring, contravariant, directory - , filepath, network, process, resourcet, text, unliftio + ({ mkDerivation, aeson, async, base, bytestring, contravariant + , directory, filepath, generic-lens, microlens, network, process + , resourcet, text, transformers, unliftio }: mkDerivation { pname = "hw-prelude"; - version = "0.0.0.1"; - sha256 = "13zi55k9by4ysf0r48a7bhh6sb5qri39rqv5c33d4a9aw4jp5jyj"; + version = "0.0.4.1"; + sha256 = "0r3jz1d7nnzgkvvfpk2pvnhmd46jfwr3qwshzpk2sviwz7nl1yrf"; libraryHaskellDepends = [ - async base bytestring contravariant directory filepath network - process resourcet text unliftio + aeson async base bytestring contravariant directory filepath + generic-lens microlens network process resourcet text transformers + unliftio ]; description = "Opinionated prelude library"; license = lib.licenses.asl20; @@ -170990,6 +173021,7 @@ self: { description = "Helper functions for HXT"; license = "LGPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hxweb" = callPackage @@ -171075,6 +173107,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "hybrid-vectors_0_2_5" = callPackage + ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: + mkDerivation { + pname = "hybrid-vectors"; + version = "0.2.5"; + sha256 = "09akcggxi1isiv4zj42gm9ynfm8mh99bw082irpmq0fbmzi8l0qb"; + libraryHaskellDepends = [ + base deepseq primitive semigroups vector + ]; + description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hydra" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , directory, filepath, hspec, hspec-discover, HsYAML, HUnit, mtl @@ -171566,8 +173612,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hypergeometric"; - version = "0.1.4.0"; - sha256 = "153j8ml8gqgmgzd6aybwcwvrnafgz54myl42l293mj64kcc1yc9r"; + version = "0.1.5.1"; + sha256 = "1ylirwvbn1npc0c1cq5a1hf9z58nxihmijzxd8jil1ag46f0c3mh"; libraryHaskellDepends = [ base ]; description = "Hypergeometric functions"; license = lib.licenses.agpl3Only; @@ -171991,10 +174037,10 @@ self: { }: mkDerivation { pname = "iCalendar"; - version = "0.4.1.0"; - sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; + version = "0.4.1.1"; + sha256 = "0bdsfl108c740zn105sw765dlfw8hvpnwk7w3psy1iyn8hasl1rh"; revision = "1"; - editedCabalFile = "037il8bdhxbbpq5p7lpvjyvlrnx24km9lib9kz6q70p8m8mi43xn"; + editedCabalFile = "09b4kqm03v6cxiq9yf0xp0sbc232gra5lg56p1rllyl2rdfq31n1"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network-uri old-locale parsec text time @@ -172708,8 +174754,8 @@ self: { ({ mkDerivation, base, ghc, ghc-tcplugin-api }: mkDerivation { pname = "if-instance"; - version = "0.5.1.0"; - sha256 = "1gl6m7schrca8kqz10ia8qz3kad4h21ijjrqcarl7r0ipvpc9hz8"; + version = "0.5.2.0"; + sha256 = "1mkfx0iivdivxlmcq4lxj2l736javvk7pyx7ja9yjmjw7zp8xpa2"; libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; testHaskellDepends = [ base ghc ]; doHaddock = false; @@ -172924,7 +174970,7 @@ self: { mainProgram = "ihaskell"; }) {}; - "ihaskell_0_11_0_0" = callPackage + "ihaskell_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , cmdargs, containers, directory, exceptions, filepath, ghc , ghc-boot, ghc-parser, ghc-paths, ghc-syntax-highlighter @@ -172935,8 +174981,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.11.0.0"; - sha256 = "1mjjsmjvapkmj69qzp9sskgxi04fymacvy0la7lr1rcrl9z5x5hd"; + version = "0.12.0.0"; + sha256 = "0syydbzws1gb9xsrfxwxsczskywm91mr7m6qljqhh2vwi1x4v0ch"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -175065,6 +177111,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "infinite-list_0_1_2" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-bench + , tasty-expected-failure, tasty-inspection-testing + , tasty-quickcheck + }: + mkDerivation { + pname = "infinite-list"; + version = "0.1.2"; + sha256 = "0v5xidhffcdn8z65nky22rhm89pbji03gp51mzqcgrzfinyjdbkb"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-expected-failure + tasty-inspection-testing tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Infinite lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "infinite-search" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -176010,18 +178076,15 @@ self: { "int-like" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, deepseq - , hashable, tasty, tasty-hunit + , hashable }: mkDerivation { pname = "int-like"; - version = "0.1.2"; - sha256 = "09874k3ria5nwb6rv2z3hgfxcm5hynvb2qgbyr7i09nwj4021hgq"; + version = "0.1.4"; + sha256 = "0djf0p2k0ayzxbabx0r2hwcm2rm7llfjhrd718c7n2zkqz297hfm"; libraryHaskellDepends = [ algebraic-graphs base containers deepseq hashable ]; - testHaskellDepends = [ - algebraic-graphs base containers deepseq hashable tasty tasty-hunit - ]; description = "Newtype wrappers over IntSet and IntMap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -176149,6 +178212,25 @@ self: { license = lib.licenses.mit; }) {}; + "integer-logarithms_1_0_4" = callPackage + ({ mkDerivation, array, base, ghc-bignum, ghc-prim, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.4"; + sha256 = "0icg8k0h7yc3aynsbidppwyfkjnq8spaczdi5bby5jqq4mncg4va"; + libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer logarithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -176199,8 +178281,8 @@ self: { }: mkDerivation { pname = "integer-types"; - version = "0.1.4.0"; - sha256 = "0c1js39965d7g3naqlhfdxjs7w4zygnibf4raha60lq3dgnc7nc0"; + version = "0.1.4.1"; + sha256 = "1q8z7w8rbdp865nlh2vz4bi5i1arkdz216ppirsg9imvwlddi5d8"; libraryHaskellDepends = [ base deepseq hashable quaalude ]; testHaskellDepends = [ base deepseq exceptions hashable hedgehog hspec hspec-hedgehog @@ -176281,6 +178363,7 @@ self: { executableHaskellDepends = [ base posix-timer streaming unix ]; description = "Poll modern Intel/AMD CPU power consumption on Linux via RAPL"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "intel-powermon"; }) {}; @@ -176486,6 +178569,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "intern_0_9_6" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.6"; + sha256 = "1jinr6z1azzz0fsbp0fs5jjzln33qq8r67c63z30nw5kfh6kxjcf"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + description = "Efficient hash-consing for arbitrary data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -176690,6 +178789,8 @@ self: { pname = "interpolation"; version = "0.1.1.2"; sha256 = "0y61hwm4xfa1wna4xk61c5p3b3z8i589lz6cxkk2pbaifydccxy0"; + revision = "1"; + editedCabalFile = "179papjalxxl2nsmcv95xz9kjdha148ljyz4syr581f1fn5vklzd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; @@ -176879,6 +178980,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "intervals_0_9_3" = callPackage + ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: + mkDerivation { + pname = "intervals"; + version = "0.9.3"; + sha256 = "07qsz1pzfgbxllavj8d428i3vnz7a5a9cxikimzd0rsz9dlprdnn"; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Interval Arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "intmap-graph" = callPackage ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { @@ -177069,6 +179183,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "invariant_0_6_4" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.6.4"; + sha256 = "1cxfy1s3p91g5n1z85058lc27xy4xfl3dnkvxcxn3m70wd7apqm9"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "inventory" = callPackage ({ mkDerivation, appendmap, array, base, bytestring, containers , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit @@ -177627,8 +179764,8 @@ self: { }: mkDerivation { pname = "ip2location"; - version = "8.5.0"; - sha256 = "1r2p6qv2n5pq4c9vr3zq6gkp7si7jm498fchqynrcnslldghz70c"; + version = "8.5.1"; + sha256 = "0x5l2rv6wq5a08f7s97cyrqfl7zsrqlsgv105s02rm8r3ifabaca"; libraryHaskellDepends = [ aeson base binary bytestring http-client http-client-tls http-types iproute split uri-encode @@ -177645,8 +179782,8 @@ self: { }: mkDerivation { pname = "ip2proxy"; - version = "3.2.0"; - sha256 = "0m50z5a32m28lfq6g8chkakvcgd6iplmx2ik0nbi2zsgfc0l209y"; + version = "3.2.1"; + sha256 = "10qqbwpwb3gr0g1nz8fm50f215y53l21i1szvv0zh62v20n4p6gz"; libraryHaskellDepends = [ aeson base binary bytestring http-client http-client-tls http-types iproute uri-encode @@ -177861,26 +179998,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , hspec, hspec-discover, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.14"; - sha256 = "0kvbddh7h5fg5makk0j9hx7wa8si6xmq3rg10w2bv3rwwnsbgw4k"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers hspec network QuickCheck - safe - ]; - testToolDepends = [ hspec-discover ]; - description = "IP Routing Table"; - license = lib.licenses.bsd3; - }) {}; - - "iproute_1_7_15" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , hspec, hspec-discover, network, QuickCheck, safe }: @@ -177898,7 +180015,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "IP Routing Table"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -178675,6 +180791,28 @@ self: { license = lib.licenses.mit; }) {}; + "isomorphism-class_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , profunctors, QuickCheck, quickcheck-instances, rebase, tasty + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.3"; + sha256 = "1j4hxr60bk813l96knr377nmjfnfxfzfmxxg46qfjb3qhrjpvw1r"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive profunctors + QuickCheck text unordered-containers vector + ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -179570,15 +181708,13 @@ self: { ({ mkDerivation, alex, array, base, bytestring, containers , criterion, deepseq, directory, filepath, happy, lazy-csv , microlens, microlens-mtl, mtl, optparse-applicative - , prettyprinter, regex-rure, silently, split, tasty, tasty-hunit - , text, transformers, vector + , prettyprinter, regex-rure, split, tasty, tasty-golden + , tasty-hunit, temporary, text, transformers, vector }: mkDerivation { pname = "jacinda"; - version = "3.2.0.0"; - sha256 = "0vm55xalnlj7kkpc0n2hdzs5i5rizbig4bi2r77h1b5d9yz0iwjw"; - revision = "2"; - editedCabalFile = "0qf5zi8k7vlkli1d51mhhc9lbh39xd4gvrhcpar792npdi8jwx1c"; + version = "3.3.0.1"; + sha256 = "09lsb5amhxlxbnyhc6jpjixgs91ygj5vx948jhm72ngjs29jyp75"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -179588,9 +181724,13 @@ self: { text transformers vector ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit text ]; - benchmarkHaskellDepends = [ base criterion deepseq silently text ]; + executableHaskellDepends = [ + base directory optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit temporary text + ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -180155,8 +182295,8 @@ self: { pname = "javelin"; version = "0.1.2.0"; sha256 = "12xzs05dkkbn93yh1f5l7m64j3rifcz9qnd5nqqd62cj6nic10xl"; - revision = "2"; - editedCabalFile = "11aizybgmbvmpjax3lsa99c1jib09sgg85g5xpws7qfggmrwj0h0"; + revision = "4"; + editedCabalFile = "19q3if5qyp6ph8ld4sps8lvplpbjyqa259a9lvzqhygaik2wdfw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180186,8 +182326,8 @@ self: { pname = "javelin-io"; version = "0.1.1.1"; sha256 = "1c6w0p7yjbc3yw12f5bflgacvivzc1n0dxgmz2qn06yiraw6jyv6"; - revision = "1"; - editedCabalFile = "0z25nvwh5wzsaa022gp4pc5bxk1xqrfj98q6ni3mh4r3kydcm50g"; + revision = "3"; + editedCabalFile = "0s0rc82jj1l6vrl0kbzfvvhbjvibjqwaj71dljms8wh94r9kyqf3"; libraryHaskellDepends = [ base bytestring cassava containers javelin unordered-containers vector @@ -181269,13 +183409,14 @@ self: { }) {}; "jsaddle-wasm" = callPackage - ({ mkDerivation, base, jsaddle }: + ({ mkDerivation, base, bytestring, jsaddle }: mkDerivation { pname = "jsaddle-wasm"; - version = "0.0.0.0"; - sha256 = "03n1541sajbms1pkad6jajxfddx6xm5py4b7j1v77kafxi61dlxw"; - libraryHaskellDepends = [ base jsaddle ]; - description = "Run JSaddle @JSM@ with the GHC WASM backend"; + version = "0.0.1.0"; + sha256 = "1cv0a2nw3y429qa0hb9fv4ddhggf3w8wqawkv3gs981f7np0sg2s"; + libraryHaskellDepends = [ base bytestring jsaddle ]; + doHaddock = false; + description = "Run JSaddle JSM with the GHC WASM backend"; license = lib.licenses.cc0; }) {}; @@ -182067,10 +184208,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.2"; - sha256 = "17smxridqmbj1ic2b25kv1byr07lw6phqa1jx98a5yccflwhvmq4"; - revision = "1"; - editedCabalFile = "0k5cxbqf062f2slqq57vm4qr32kd3xa8kn9zmvl06iwwb2fd6zjf"; + version = "0.2.3"; + sha256 = "1yfa6fpc968pyy403dxq9ipk4k2xl16pjdimm0n8bn7766ihcszb"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -183625,10 +185764,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4.2"; - sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; - revision = "3"; - editedCabalFile = "00wy4v9xdnp4801qww61gpqfshnbymmh4571rs56lq2f1apzifgv"; + version = "0.4.3"; + sha256 = "0c4nm5ns5acg73biysww8jam1v4kj1k9rk96bl6ad5g2nria7hlp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -185094,7 +187231,7 @@ self: { mainProgram = "keter"; }) {}; - "keter_2_1_7" = callPackage + "keter_2_1_8" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, directory, fast-logger, filepath @@ -185108,8 +187245,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "2.1.7"; - sha256 = "16chqiyqp3cjyf9ci6zkbgngynf0q6jrkw6nzjc6m6s20sr07j1r"; + version = "2.1.8"; + sha256 = "1ba10cd5iiv1ignra11k30cfip3p8sw382735vvigc6gbj6h45wk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185139,8 +187276,8 @@ self: { ({ mkDerivation, aeson, base, containers, HUnit, text }: mkDerivation { pname = "keuringsdienst"; - version = "1.0.2.0"; - sha256 = "156z9wxm62s70y83a51lxpjy3c2x0skq2p3jdjdkpwgqa0i7m7yr"; + version = "1.0.2.2"; + sha256 = "0wg13kgzq7hvl5fipwwsbdfi53ymz7ki794bhws8jxbc92c05whd"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ aeson base containers HUnit text ]; description = "Data validation in Haskell that is composable, made easy and clean"; @@ -185255,32 +187392,18 @@ self: { }) {}; "keycode" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "keycode"; - version = "0.2.2"; - sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "11"; - editedCabalFile = "0il646ra0nb0fy1310im1y82w9gh08j6vwi7hw7kpxy1h9q6jp4j"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = lib.licenses.bsd3; - }) {}; - - "keycode_0_2_3" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "keycode"; version = "0.2.3"; sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; + revision = "1"; + editedCabalFile = "12kpkn9l45rfb5vdakgf2sbqs2by98d4dzq2qyzkfl4jlxk7l4j4"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; description = "Maps web browser keycodes to their corresponding keyboard keys"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "keyed" = callPackage @@ -185409,6 +187532,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "keys_3_12_4" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12.4"; + sha256 = "04l9ssmns3v2xzfrk5pxcacvl8nh26rsw5hhw22v4zxzbh9s44ll"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + description = "Keyed functors and containers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -187894,8 +190036,8 @@ self: { pname = "lame"; version = "0.2.2"; sha256 = "0zfjiyabzzkg9mdy8ynf9sa89zcdpvynzhph7svyjxw6a6h0i0mg"; - revision = "1"; - editedCabalFile = "1d12xrg7whm83v60dq01r961svp8dn212qwy108wh8z5v5hvfryp"; + revision = "2"; + editedCabalFile = "11797lagzb5i24b7h0m50k1lxqldlykqyj1f8aka0jzh7a340xlx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory exceptions filepath text wave @@ -188177,6 +190319,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "language-c_0_10_0" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process + }: + mkDerivation { + pname = "language-c"; + version = "0.10.0"; + sha256 = "0m3dphd0r0n763a5rrg0z4fmiaqn7nkjq15l4vif332zrmgipb37"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -189320,6 +191481,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "language-spir-v" = callPackage + ({ mkDerivation, base, bytestring, c-enum, nowdoc, shaderc + , template-haskell + }: + mkDerivation { + pname = "language-spir-v"; + version = "0.1.0.3"; + sha256 = "169fadphm63gp3bqvrnmd3335rcf1dgybx1vp80mcysskvfabyia"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-enum nowdoc template-haskell + ]; + libraryPkgconfigDepends = [ shaderc ]; + testHaskellDepends = [ + base bytestring c-enum nowdoc template-haskell + ]; + description = "Data type for SPIR-V"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) shaderc;}; + "language-sqlite" = callPackage ({ mkDerivation, array, base, bytestring, containers, mtl , template-haskell, utf8-string @@ -189569,8 +191750,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.3.1"; sha256 = "1mf41wcbxkgiv71c3jjwhsdg9d7qpa88qsifpa5vgplpx2v1p6ya"; - revision = "2"; - editedCabalFile = "1jz2kiy64vbxazhy4bsfcnwd14kqc7g9vk7v6yyw0p0zlhqfzfv5"; + revision = "3"; + editedCabalFile = "19xnq84gw4937zhmj2h8nlrlsikni7qjdm2dbljl1qv68cjs3gjz"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -189812,6 +191993,8 @@ self: { pname = "latex"; version = "0.1.0.4"; sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw"; + revision = "1"; + editedCabalFile = "0ryjw2rsw979b9i7i23b6qf4y192za09f1yhi49czgsf4184sccb"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Parse, format and process LaTeX files"; license = lib.licenses.bsd3; @@ -189975,6 +192158,31 @@ self: { mainProgram = "latex-svg-filter"; }) {}; + "lathe" = callPackage + ({ mkDerivation, base, bytestring, hspec, primitive, random, text + }: + mkDerivation { + pname = "lathe"; + version = "0.1.0.0"; + sha256 = "11ni01fma7rgd16gng8iipd4gqg0aqsmwgxgp0ni1sr02y9yg36c"; + libraryHaskellDepends = [ base bytestring primitive text ]; + testHaskellDepends = [ base bytestring hspec primitive random ]; + description = "Pure incremental byte parser"; + license = lib.licenses.bsd3; + }) {}; + + "lathe-time" = callPackage + ({ mkDerivation, base, bytestring, hspec, lathe, time }: + mkDerivation { + pname = "lathe-time"; + version = "0.1.0.0"; + sha256 = "0w75dlprdd1ppsl3g7kkky6c27wb5l7rm9vg355vmxkxlij7mp83"; + libraryHaskellDepends = [ base bytestring lathe time ]; + testHaskellDepends = [ base bytestring hspec lathe time ]; + description = "lathe + time"; + license = lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances, tagged @@ -190007,25 +192215,25 @@ self: { , generic-lens, hashtables, http-client, http-client-tls , http-types, HUnit, iso8601-time, lens, lrucache, memory , monad-logger, monad-loops, mtl, pcre-light, random, scientific - , semver, text, time, unordered-containers, uuid, yaml + , semver, text, time, unordered-containers, uuid, yaml, zlib }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.3.0"; - sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; + version = "4.4.0"; + sha256 = "1kqdnq8982n89b15chwwn72f6q0dyr4c9y2w91jh311yl479ghs4"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client http-client-tls http-types iso8601-time lens lrucache memory monad-logger monad-loops mtl pcre-light random scientific semver - text time unordered-containers uuid yaml + text time unordered-containers uuid yaml zlib ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client http-client-tls http-types HUnit iso8601-time lens lrucache memory monad-logger monad-loops mtl pcre-light random scientific semver - text time unordered-containers uuid yaml + text time unordered-containers uuid yaml zlib ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; @@ -190140,6 +192348,28 @@ self: { broken = true; }) {}; + "lawful-conversions" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , profunctors, QuickCheck, quickcheck-instances, rebase, tasty + , tasty-quickcheck, text, time, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "lawful-conversions"; + version = "0.1.6"; + sha256 = "1gp4z8g5smnhi31h4cpniha5g1lha6hh5rhh7cv1cwkrzh0cmkbg"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive profunctors + QuickCheck text time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text + ]; + description = "Lawful typeclasses for bidirectional conversion between types"; + license = lib.licenses.mit; + }) {}; + "lawless-concurrent-machines" = callPackage ({ mkDerivation, async, base, containers, lifted-async, machines , monad-control, semigroups, tasty, tasty-hunit, time, transformers @@ -190191,8 +192421,8 @@ self: { }: mkDerivation { pname = "layered-graph-drawing"; - version = "0.1.0.0"; - sha256 = "01fivjy6nf2zvcc20djyklq71pcl7mp9167ijc8vjxn75vq5scls"; + version = "0.2.0.0"; + sha256 = "0pfsnwjzckl35zsq65bk10gi63g17pivgv7hmcqc7d4avrwz7n3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190634,6 +192864,8 @@ self: { libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lca" = callPackage @@ -190737,8 +192969,8 @@ self: { }: mkDerivation { pname = "ldap-scim-bridge"; - version = "0.9"; - sha256 = "13jndxxzrqc101q4bb7z2fig5cjjm8805b3335ni1hmx1imc16hp"; + version = "0.10"; + sha256 = "0pn3qp2p7w40wdagkwzq23i5dcimrsca1xwxh8jgffqr7zdym57v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191028,6 +193260,8 @@ self: { pname = "learn-physics"; version = "0.6.7"; sha256 = "05lizs5vyknx5krprc7q12kb7nszy6qxf4zb7b2zzwv8r04ll23h"; + revision = "1"; + editedCabalFile = "193fycxpw3insffm6hd4ld6qmmxjrk83yildkqp22avbxi8kwq03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191732,6 +193966,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-regex-pcre_1_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, lens + , pcre-heavy, pcre-light, template-haskell, text + }: + mkDerivation { + pname = "lens-regex-pcre"; + version = "1.1.2.0"; + sha256 = "1w3bxk97pj5r45zm2nb3xcmzr24gvfy8bxcwavyicwa57xyz716a"; + libraryHaskellDepends = [ + base bytestring containers lens pcre-heavy pcre-light + template-haskell text + ]; + testHaskellDepends = [ + base bytestring containers hspec lens pcre-heavy pcre-light + template-haskell text + ]; + description = "A lensy interface to regular expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, mtl, transformers @@ -191755,8 +194010,8 @@ self: { pname = "lens-sop"; version = "0.3.0"; sha256 = "145yplksxyk15fyhjssjy5f4z18h1d8bgf25pb1vqdfr10rnffi1"; - revision = "1"; - editedCabalFile = "0gnjfk3na3pk3zm2bppmic7adfpaic051wf6hlfyaysg4acwpxvm"; + revision = "2"; + editedCabalFile = "1qrcpp7wwin7gsbd8r0g7mx4a45wg6sjpl85v6l8dd056s7a9w16"; libraryHaskellDepends = [ base generics-sop optics-core transformers ]; @@ -191826,8 +194081,8 @@ self: { }: mkDerivation { pname = "lens-toml-parser"; - version = "0.3.0.0"; - sha256 = "1dl9rxs0njcsv6rfg4bmipxbvdr6240x5dsr8857c54cjffwp574"; + version = "0.3.0.1"; + sha256 = "12bfjda8inn97azhkraz96lv3a1i21nxbxc4zsbpf1pfm76hripf"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ base containers dwergaz lens-family text toml-parser @@ -191977,7 +194232,7 @@ self: { maintainers = [ lib.maintainers.rvl ]; }) {}; - "lentil_1_5_7_0" = callPackage + "lentil_1_5_8_0" = callPackage ({ mkDerivation, base, bytestring, csv, deepseq, directory, dlist , filemanip, filepath, hspec, hspec-discover, megaparsec, mtl , natural-sort, optparse-applicative, prettyprinter @@ -191986,8 +194241,10 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.7.0"; - sha256 = "1xd68cfpq78w778j36d6hxsbi7cjdbsaab6ay0ian4b5a0qwnpic"; + version = "1.5.8.0"; + sha256 = "08g15kzynync0kl9f247sifzqpkjyvigc5r31w2n3vivi3pdcafn"; + revision = "1"; + editedCabalFile = "0n991bjlcjchmjlgfxg709sp6vsi6c5igzs7904i6hfabq3z47q5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193227,6 +195484,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "libremidi" = callPackage + ({ mkDerivation, base, containers, data-default, mtl, pipewire, stm + , systemd, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "libremidi"; + version = "0.4.0"; + sha256 = "1fqdrx7mpcxzib42nkn13lfsyq67rbc40gd4yrvlr4fxcmscdbkg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default mtl stm text transformers + ]; + libraryPkgconfigDepends = [ pipewire systemd ]; + executableHaskellDepends = [ + base containers data-default mtl stm text transformers + ]; + testHaskellDepends = [ + base containers data-default mtl stm tasty tasty-hunit text + transformers + ]; + description = "libremidi bindings for haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "libremidi-exe"; + broken = true; + }) {inherit (pkgs) pipewire; inherit (pkgs) systemd;}; + "libretls" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls , monad-ste, primitive, transformers, vector @@ -193296,20 +195581,20 @@ self: { "libsecp256k1" = callPackage ({ mkDerivation, base, bytestring, deepseq, either, entropy , hashable, hedgehog, hspec, hspec-api, HUnit, memory, monad-par - , secp256k1, transformers + , random, secp256k1, transformers }: mkDerivation { pname = "libsecp256k1"; - version = "0.2.1"; - sha256 = "15kz61px1xpf80c6jaj7qmfs1274ad05kp61y1b1vybxiqbzrig1"; + version = "0.3.0"; + sha256 = "0avl6yqqq06jd3gw6djb29qavksavcy5hmpffp86s96hygl6vxak"; libraryHaskellDepends = [ - base bytestring deepseq entropy hashable hedgehog memory + base bytestring deepseq entropy hashable hedgehog memory random transformers ]; libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base bytestring deepseq either entropy hashable hedgehog hspec - hspec-api HUnit memory monad-par transformers + hspec-api HUnit memory monad-par random transformers ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; @@ -193492,6 +195777,39 @@ self: { broken = true; }) {inherit (pkgs) libtelnet;}; + "libtorch-ffi" = callPackage + ({ mkDerivation, async, base, bytestring, c10, containers, hspec + , inline-c, inline-c-cpp, libtorch-ffi-helper, optparse-applicative + , safe-exceptions, sysinfo, template-haskell, torch, torch_cpu + }: + mkDerivation { + pname = "libtorch-ffi"; + version = "2.0.0.1"; + sha256 = "1qnfiz03w9gsw2v4c6w4rsy44823salnvgkqp67b51ga44ihwv0q"; + libraryHaskellDepends = [ + async base bytestring containers inline-c inline-c-cpp + libtorch-ffi-helper optparse-applicative safe-exceptions sysinfo + template-haskell + ]; + librarySystemDepends = [ c10 torch torch_cpu ]; + testHaskellDepends = [ base hspec safe-exceptions ]; + description = "Haskell bindings for PyTorch"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {c10 = null; torch = null; torch_cpu = null;}; + + "libtorch-ffi-helper" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "libtorch-ffi-helper"; + version = "2.0.0.0"; + sha256 = "04vf7in5pj7wl17cmj5v1km1riny8fy69yabi2yjzs554kaggzj0"; + libraryHaskellDepends = [ base ghc ]; + description = "Helpers for integrating libtorch-ffi with Hasktorch"; + license = lib.licenses.bsd3; + }) {}; + "libversion" = callPackage ({ mkDerivation, base, bytestring, libversion }: mkDerivation { @@ -193590,16 +195908,23 @@ self: { }) {}; "libxml-sax" = callPackage - ({ mkDerivation, base, bytestring, libxml2, text, xml-types }: + ({ mkDerivation, base, bytestring, chell, containers, libxml2, text + , transformers, xml-types + }: mkDerivation { pname = "libxml-sax"; - version = "0.7.5"; - sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r"; + version = "0.7.6"; + sha256 = "1zzd2wyaq7yly5x8ikfv5lyxvmw8psln3kmkl0y3sm0kqf6zcj92"; libraryHaskellDepends = [ base bytestring text xml-types ]; librarySystemDepends = [ libxml2 ]; libraryPkgconfigDepends = [ libxml2 ]; + testHaskellDepends = [ + base bytestring chell containers text transformers xml-types + ]; description = "Bindings for the libXML2 SAX interface"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libxml2;}; "libxslt" = callPackage @@ -193816,6 +196141,8 @@ self: { pname = "lift-generics"; version = "0.3"; sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; + revision = "1"; + editedCabalFile = "101rh63bgq9kwiqfzylijy28y9is6xfa13swscygr5jw3nm061mp"; libraryHaskellDepends = [ base ghc-prim template-haskell th-compat ]; @@ -193859,8 +196186,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.2.6"; - sha256 = "1sh11zpmmxbkf00j6k0k858yhxpn7fckvw3d5yynkw263pz1hrzn"; + version = "0.10.2.7"; + sha256 = "0m9xzlj9hrbs0j4sak2jdvm13l66mpr2k99xcv7rhy8wfssvz0f2"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -194543,6 +196870,8 @@ self: { pname = "linear-circuit"; version = "0.1.0.4"; sha256 = "0pyja29w1vrsi8vi65qdbc3c1vajiqgf5gff2zqh368k3hd4zpi4"; + revision = "1"; + editedCabalFile = "0gcz827i0jd9cnswrai36isdrga0y8vdlyb4nn2xjcpzy6zz6bfd"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -194737,8 +197066,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "2.3"; - sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw"; + version = "2.4"; + sha256 = "1fv3gadnxxg0g8wb5v5a4fj9ny5zdhwhw2ykbzizgp7mzg90pz27"; libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = lib.licenses.bsd3; @@ -194834,8 +197163,8 @@ self: { }: mkDerivation { pname = "linenoise"; - version = "0.4.0"; - sha256 = "0j91vskwkjn98acbx8jgxq76xk53bzds2k9b9zjfra5y17bn0gqr"; + version = "0.4.2"; + sha256 = "19fzj9rwsajh702vhhfshwkwd5kwgl8c5iw02j8wiivamnvrv611"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195284,6 +197613,20 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; + "linux-namespaces_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "linux-namespaces"; + version = "0.2.0.1"; + sha256 = "11giyfb1r7n8y4f2bvjycg4zv0c2dh9s64qcmvlr5akwvwjlzylb"; + libraryHaskellDepends = [ base bytestring unix ]; + description = "Work with linux namespaces: create new or enter existing ones"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.alexfmpe ]; + }) {}; + "linux-perf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, ghc-events, mtl, pretty, process, unix @@ -196354,14 +198697,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "little-logger_3_0_0" = callPackage + "little-logger_3_0_1" = callPackage ({ mkDerivation, base, directory, monad-logger, mtl, optics, tasty , tasty-hunit, temporary, text, unliftio-core }: mkDerivation { pname = "little-logger"; - version = "3.0.0"; - sha256 = "1ckhkv6pj0sbjs7kn11jb8x5v4ilm8rx51mmi84zyzmxfkrpamwf"; + version = "3.0.1"; + sha256 = "1wqgpr21rl2jcfpspqhhl63apyzyj1906clg3ibl97ckqwcyrz97"; libraryHaskellDepends = [ base monad-logger mtl optics text unliftio-core ]; @@ -197653,9 +199996,11 @@ self: { }: mkDerivation { pname = "log-effectful"; - version = "1.0.0.0"; - sha256 = "19i0zvhgpc0briji7hsini3836q0k03nq60svswfz6cjs91izzsx"; - libraryHaskellDepends = [ base effectful-core log-base text time ]; + version = "1.0.1.0"; + sha256 = "00fagiw9wx8ga1d456rdd38hqq7a4rl2bs9hvrgg5bp2qna1i1cq"; + libraryHaskellDepends = [ + aeson base effectful-core log-base text time + ]; testHaskellDepends = [ aeson base effectful-core log-base text ]; description = "Adaptation of the log library for the effectful ecosystem"; license = lib.licenses.bsd3; @@ -198071,24 +200416,25 @@ self: { }) {}; "logic-TPTP" = callPackage - ({ mkDerivation, alex, ansi-wl-pprint, array, base, containers - , happy, mtl, pcre-light, pointed, QuickCheck, semigroups, syb - , transformers, transformers-compat + ({ mkDerivation, alex, array, base, containers, happy, mtl + , pcre-light, pointed, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, semigroups, syb, text, transformers }: mkDerivation { pname = "logic-TPTP"; - version = "0.5.1.0"; - sha256 = "1s3r85zw5ci5mg9rrik351xxi5k8cszlpdanwpxyrinjd3y6j01i"; + version = "0.6.0.0"; + sha256 = "0dicg310lbj5zb0lbvsvvvb5wsabpcm6plq6n5v1nppjz954yhlw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array base containers mtl pointed QuickCheck - semigroups syb transformers transformers-compat + array base containers mtl pointed prettyprinter + prettyprinter-ansi-terminal QuickCheck semigroups syb text + transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - ansi-wl-pprint base pcre-light QuickCheck semigroups transformers - transformers-compat + base pcre-light prettyprinter prettyprinter-ansi-terminal + QuickCheck semigroups transformers ]; description = "Import, export etc. for TPTP, a syntax for first-order logic"; license = "GPL"; @@ -198143,17 +200489,16 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, async, base, mtl, tasty, tasty-hunit, transformers + ({ mkDerivation, async, base, exceptions, mtl, tasty, tasty-hunit + , transformers }: mkDerivation { pname = "logict"; - version = "0.8.1.0"; - sha256 = "04xqwfbvh5gfjwbvmadbakq0932gskh2gy68aw7251443ic4gp6k"; - revision = "1"; - editedCabalFile = "0ckbljn4rcvbnni6ldn6wd5p4c6y6dx5ixc8hg2i9a7irllgifr9"; + version = "0.8.2.0"; + sha256 = "1vxb8vyfhvl901kfywvr4czwmiz3ah4l9rlcrx7djs4f3kwfd6hq"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl transformers ]; + libraryHaskellDepends = [ base exceptions mtl transformers ]; testHaskellDepends = [ async base mtl tasty tasty-hunit transformers ]; @@ -198590,8 +200935,8 @@ self: { }: mkDerivation { pname = "looksee"; - version = "0.6.0"; - sha256 = "1vv48fnr1dbbkcyw6cvfal3fggyn7rw4gzwzvix1qyyfsl9g7cm9"; + version = "0.8.0"; + sha256 = "0nzbcw766wpn86z8vsmf765zisw8af3304nas2fngm7hkv77v5ds"; libraryHaskellDepends = [ base bifunctors containers errata mmorph mtl recursion-schemes scientific text vector @@ -198606,13 +200951,15 @@ self: { }) {}; "looksee-trip" = callPackage - ({ mkDerivation, base, daytripper, looksee, prettyprinter, text }: + ({ mkDerivation, base, daytripper, looksee, prettyprinter + , prop-unit, text + }: mkDerivation { pname = "looksee-trip"; - version = "0.6.0"; - sha256 = "0nc7i12swdq4shz4brkrblkx306fgc5lcfqc3crb9kiq014qd2c5"; + version = "0.8.0"; + sha256 = "0hr6zz8f69w2ijvid8l7d1dxl2sablx3f3vjx494lla9k3hy6ss9"; libraryHaskellDepends = [ - base daytripper looksee prettyprinter text + base daytripper looksee prettyprinter prop-unit text ]; description = "A simple text parser with decent errors"; license = lib.licenses.bsd3; @@ -198715,8 +201062,8 @@ self: { }: mkDerivation { pname = "looper"; - version = "0.3.0.1"; - sha256 = "0kcy4pr7z6ppqgnxbssp597qyjgcm25pdhbhzxjp0n205nywiz11"; + version = "0.3.0.2"; + sha256 = "1dbygq6m4gdzvjz5jsf8bbsw1igr5y3g554vl6gqpkhxvya83y4c"; libraryHaskellDepends = [ base opt-env-conf text time unliftio ]; testHaskellDepends = [ base opt-env-conf opt-env-conf-test sydtest unliftio @@ -199238,6 +201585,8 @@ self: { pname = "lsp"; version = "2.7.0.0"; sha256 = "1vxyl3p4b4nskl4icvw5087683lbr5zjj64wwmckw3l2hgvqwr6j"; + revision = "1"; + editedCabalFile = "0zmzs0adh7p7zp9c67qn4p8glxlx1k5b09hp8czsns23jbl7ziff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200377,6 +202726,37 @@ self: { broken = true; }) {}; + "lz4-frame-conduit_0_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, hspec, inline-c, optparse-applicative, QuickCheck + , raw-strings-qq, resourcet, template-haskell, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "lz4-frame-conduit"; + version = "0.1.0.2"; + sha256 = "06b9c8p75smmhzi9gy2sql3ivrfjk3y2lmf03wi76prwx5z6rp4c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra containers inline-c + raw-strings-qq resourcet template-haskell unliftio unliftio-core + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra optparse-applicative + resourcet text + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec QuickCheck resourcet + unliftio-core + ]; + description = "Conduit implementing the official LZ4 frame streaming format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "haskell-lz4c"; + broken = true; + }) {}; + "lz4-hs" = callPackage ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty , tasty-hunit, temporary @@ -203149,16 +205529,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "matchable_0_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, generically + , hashable, hspec, tagged, unordered-containers, vector + }: + mkDerivation { + pname = "matchable"; + version = "0.2"; + sha256 = "06k4bwckf4rpji11xky83gb0zrfbfggjf85l9kcz5yc3p1l909ma"; + libraryHaskellDepends = [ + base base-orphans containers generically hashable tagged + unordered-containers vector + ]; + testHaskellDepends = [ base containers generically hspec ]; + description = "A type class for Matchable Functors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "matchable-th" = callPackage ({ mkDerivation, base, bifunctors, containers, matchable , template-haskell, th-abstraction }: mkDerivation { pname = "matchable-th"; - version = "0.2"; - sha256 = "1v2r38r59wk699nsql3mw7z83gm1snvnci146ply34za7i42zp54"; - revision = "1"; - editedCabalFile = "17mdf8bsq9s2w4bl76zink0k55my43a3702f0zfxgqy5p2b09pkw"; + version = "0.2.1"; + sha256 = "0yxm9r33x0cis2fq3n9hpi0g457ai616x8525pyvh3iz6gfs2whz"; libraryHaskellDepends = [ base bifunctors matchable template-haskell th-abstraction ]; @@ -204734,17 +207130,17 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec_9_6_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, mtl, parser-combinators, scientific, text - , transformers, weigh + "megaparsec_9_7_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, mtl, parser-combinators + , scientific, text, transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "9.6.1"; - sha256 = "1zyb1mqa2mjjig5aggndifh6zqlwbw8sn4nm4an73gkxhjz5f8m3"; + version = "9.7.0"; + sha256 = "15zc66lplq5382wayigcw9kql08nvp9403a8f9xaw85z4lv45vdr"; libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq mtl + array base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers ]; benchmarkHaskellDepends = [ @@ -204779,17 +207175,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec-tests_9_6_1" = callPackage + "megaparsec-tests_9_7_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-megaparsec, megaparsec, mtl , QuickCheck, scientific, temporary, text, transformers }: mkDerivation { pname = "megaparsec-tests"; - version = "9.6.1"; - sha256 = "1l3rmg4ymw4czqkkb3502g322ijdg11c1img9l4p6ipy7hdzw52n"; - revision = "1"; - editedCabalFile = "0vycmn3c32z1bk19612277df41in55rkyk23gk3m007drsaq3xdl"; + version = "9.7.0"; + sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -204876,6 +207270,28 @@ self: { broken = true; }) {}; + "mello" = callPackage + ({ mkDerivation, base, bowtie, containers, daytripper, foldl + , looksee, looksee-trip, mtl, prettyprinter, prop-unit + , recursion-schemes, scientific, text + }: + mkDerivation { + pname = "mello"; + version = "0.3.0"; + sha256 = "0aznzydk9p4r7jnwhf46dcz56gwikyv1fm006w5n3nxf20qqaybb"; + libraryHaskellDepends = [ + base bowtie containers foldl looksee mtl prettyprinter + recursion-schemes scientific text + ]; + testHaskellDepends = [ + base bowtie containers daytripper foldl looksee looksee-trip mtl + prettyprinter prop-unit recursion-schemes scientific text + ]; + description = "No-fuss syntax with s-expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mellon-core" = callPackage ({ mkDerivation, async, base, doctest, hspec, mtl, protolude , QuickCheck, quickcheck-instances, time, transformers @@ -205359,6 +207775,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "memory-pool" = callPackage + ({ mkDerivation, async, base, criterion, deepseq, primitive, pvar + , QuickCheck, random, reflection, tasty, tasty-hunit + , tasty-quickcheck, unliftio + }: + mkDerivation { + pname = "memory-pool"; + version = "0.1.0.0"; + sha256 = "0ip3fdapszbv7kb1m61qq7aznw6b48lc87n1nlm419xpsfqm4gri"; + libraryHaskellDepends = [ base primitive pvar ]; + testHaskellDepends = [ + async base primitive pvar QuickCheck random reflection tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq unliftio ]; + description = "Short description"; + license = lib.licenses.asl20; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -206519,6 +208954,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-platform_0_4_3_6" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.4.3.6"; + sha256 = "0bbskwm9lh2lmk54a0hwc4aq9fpw4zpq5089nd7w2w0m9rny9jka"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + description = "microlens + all batteries included (best for apps)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-pro" = callPackage ({ mkDerivation, base, containers, microlens, microlens-contra , microlens-platform, microlens-th, mtl, profunctors, tagged @@ -206527,8 +208979,8 @@ self: { }: mkDerivation { pname = "microlens-pro"; - version = "0.2.0.1"; - sha256 = "16bb5myflaxwksqkl890vg3349sd5lcr6g2iaq8kn82k3wkq0ynm"; + version = "0.2.0.2"; + sha256 = "1n4qfv55xax420zy4g9xwh8sq3mmmcybblx80iw5kigsmvhs6kdm"; libraryHaskellDepends = [ base containers microlens microlens-contra microlens-platform microlens-th mtl profunctors tagged template-haskell text @@ -206576,6 +209028,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_16" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.16"; + sha256 = "1gd4rz00x4akaf3wfchvbk90ra9kjqsv3ixkcnsbrij3hhjb2w47"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -206775,8 +209245,8 @@ self: { pname = "midi-music-box"; version = "0.0.1.2"; sha256 = "0rnjwis6y0lnyfjxnxqk3zsh78ylccq5v21avb97vybmj0pld1l9"; - revision = "3"; - editedCabalFile = "0yh1mqpsw12dci8fgw124jbz5588v5vxdzggrn67x1pd4wvjmr8k"; + revision = "4"; + editedCabalFile = "1lpgd33852in97g89q53qd6xag29nzmp281xnh31rdppjr7zadhc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -207021,13 +209491,13 @@ self: { , bytestring, case-insensitive, conduit, conduit-extra, directory , filepath, hspec, http-client, http-date, http-types, network , old-locale, parsec, resourcet, split, streaming-commons, text - , time, time-manager, transformers, unix, unix-time, unliftio + , time, time-manager, transformers, unix, unix-time , unordered-containers, wai, wai-app-file-cgi, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "4.0.7"; - sha256 = "09cjfip6gkqrhr0dwvk5k88ygi80ikvx0ykvmdp2f6np149prfr8"; + version = "4.0.8"; + sha256 = "0yqj3m7y493bzjmx1ycyid4s40h11l46w8lv1783drlw7wpakmya"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -207035,7 +209505,7 @@ self: { array async auto-update base byteorder bytestring case-insensitive conduit conduit-extra directory filepath http-date http-types network parsec resourcet split streaming-commons text unix - unix-time unliftio unordered-containers wai wai-app-file-cgi warp + unix-time unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ base bytestring conduit-extra directory filepath http-client @@ -207058,6 +209528,8 @@ self: { pname = "mighty-metropolis"; version = "2.0.0"; sha256 = "0r1viswlggm6y7k3x5cvfmbly8jmk1ivhfp8vpgvkamxagzhkrk4"; + revision = "1"; + editedCabalFile = "0l4702l1rd17wvsiwfaz47nj7sqwaa1zsdz7w82aym29ll3j1b1k"; libraryHaskellDepends = [ base kan-extensions mcmc-types mwc-probability pipes primitive transformers @@ -207421,8 +209893,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.4.0.0"; - sha256 = "0l94dfs2i18yvxi8insl5627wdpm523bygkbc5rg8c38gzrqja6q"; + version = "1.5.0.0"; + sha256 = "13lyxlhvkrmwgpf6fk58sagd30dz5z2b3n8ipfgz9c0r53lcwa0d"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -208213,8 +210685,10 @@ self: { }: mkDerivation { pname = "miso"; - version = "1.8.4.0"; - sha256 = "113gm3rqc17aa3s2hxzdm3q78c7jlf728lqggl5khya1kh2i3yl2"; + version = "1.8.5.0"; + sha256 = "0lbr1hwaidsscrqp3p6p3rr5q1mxfg3f7bb62x974jll3lisxlyb"; + revision = "1"; + editedCabalFile = "18zwq74mzv0qkila4dq554nrcziaz946chmb51jrhx8p2mdspa7y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208243,8 +210717,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.8.4.0"; - sha256 = "0z0q0pxkihdhjpm516xxdy3igbx23pfpn7jnjbvf2v054vjq2rmg"; + version = "1.8.5.0"; + sha256 = "0v7n1wibv4r4kn2n29np6p6rs00z6v9zfdgxi2ja38nqgc7aky7l"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -208621,6 +211095,8 @@ self: { pname = "mmark"; version = "0.0.8.0"; sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr"; + revision = "1"; + editedCabalFile = "13d46lpf5b1kj6b1g89gb1s91h87njz3k69mp39nsfhwq19ygibf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -208857,20 +211333,20 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + ({ mkDerivation, base, directory, end-of-exe, mmsyn2-array , mmsyn7ukr-common, process }: mkDerivation { pname = "mmsyn7l"; - version = "0.9.1.0"; - sha256 = "0c8gcvbb2xw89cnf2h85cbm9n2zxqdqc0kkbh9w3vx2zsyy5865i"; + version = "0.9.2.0"; + sha256 = "1h1l1pzy3vwg1ciidq15cdn5cxpm25ccl0i9f99d8l1c3xljz9g9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + base directory end-of-exe mmsyn2-array mmsyn7ukr-common process ]; executableHaskellDepends = [ - base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + base directory end-of-exe mmsyn2-array mmsyn7ukr-common process ]; description = "Modifies the amplitudes of the sounds representations created by mmsyn7ukr-array and mmsyn7ukr packages"; license = lib.licenses.mit; @@ -208918,29 +211394,29 @@ self: { }) {}; "mmsyn7ukr-array" = callPackage - ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + ({ mkDerivation, base, directory, end-of-exe, mmsyn2-array , mmsyn7ukr-common, process }: mkDerivation { pname = "mmsyn7ukr-array"; - version = "0.2.0.0"; - sha256 = "0wh0a141mwkn0bzv4r4kzzfw1xdg6l70pvpibm60d5slknlm4spz"; + version = "0.3.0.0"; + sha256 = "1y4ml7dq1k2czbf0f7x0ij2h7rsaisl7zs6q1sg4brmci4251i56"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + base directory end-of-exe mmsyn2-array mmsyn7ukr-common process ]; - description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h-array, dobutokO2-array and other similar packages"; + description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by dobutokO2 and other similar packages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; "mmsyn7ukr-common" = callPackage - ({ mkDerivation, base, directory, mmsyn3, process }: + ({ mkDerivation, base, directory, end-of-exe, process }: mkDerivation { pname = "mmsyn7ukr-common"; - version = "0.2.0.0"; - sha256 = "0d7i1xhys493mx6ynn7zx7jidjffkkmnid5llwyk8m4040riw8ay"; - libraryHaskellDepends = [ base directory mmsyn3 process ]; + version = "0.3.1.0"; + sha256 = "021vrlljbavlvsangh870xyd8wixnic5p287g6kgdsgf2zb8zx5h"; + libraryHaskellDepends = [ base directory end-of-exe process ]; description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -209095,20 +211571,20 @@ self: { "mock-time" = callPackage ({ mkDerivation, base, error-or, error-or-utils, exceptions, inbox , mtl, primitive, QuickCheck, resourcet, stm, tasty, tasty-hunit - , tasty-quickcheck, time, unliftio-core + , tasty-quickcheck, time, transformers, unliftio-core }: mkDerivation { pname = "mock-time"; - version = "0.1.0"; - sha256 = "0fwnlkg3kbi7qh43ycymxxywsh8cw5f5km0ni4plf63k931y40jg"; + version = "0.1.1"; + sha256 = "1j37p2d6c7m48s8zs4s37ggvjdhhjzghck5yw5c062mnx1j9j1ni"; libraryHaskellDepends = [ base error-or exceptions mtl primitive resourcet stm time - unliftio-core + transformers unliftio-core ]; testHaskellDepends = [ base error-or error-or-utils exceptions inbox mtl primitive QuickCheck resourcet stm tasty tasty-hunit tasty-quickcheck time - unliftio-core + transformers unliftio-core ]; description = "Mock time in tests"; license = lib.licenses.bsd3; @@ -209142,8 +211618,8 @@ self: { }: mkDerivation { pname = "mockcat"; - version = "0.5.1.0"; - sha256 = "08z3v6wvm42hgjsl5diqmv4m8j6idxnwy37w9fph8i22a2kf5hn8"; + version = "0.5.2.0"; + sha256 = "0b3i5vswlijyf3142shwrw1z8vj152b4k466c0310ayih3mcc61p"; libraryHaskellDepends = [ base mtl template-haskell text transformers ]; @@ -209826,8 +212302,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.3.0.3"; - sha256 = "14fgmzr7mqcczrixx3hdbi64bd2vs7gbdhcvsn7jajyldjyqdkpf"; + version = "1.3.0.4"; + sha256 = "0r7gmymd8vy8q0hgkm2s9qmlm3q93nss6yl7rahpl2lxb838qrfy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -210193,6 +212669,8 @@ self: { pname = "monad-ideals"; version = "0.1.1.0"; sha256 = "04wgb39kj7j3v9df5g8ij7n7fndhjic93y88k0wxpmzd9ywd6zdf"; + revision = "1"; + editedCabalFile = "021gfnffc7m5i3k6wr5ksxyd2bck6hg7h2spbk9wxn46zcdi9z7c"; libraryHaskellDepends = [ base bifunctor-classes-compat comonad semigroupoids ]; @@ -211306,8 +213784,8 @@ self: { }: mkDerivation { pname = "monadic-bang"; - version = "0.2.2.1"; - sha256 = "1map2ywq3inzqki6fkw8f5frx85cic1c06ccyy3p0laahlz8i1z8"; + version = "0.2.2.2"; + sha256 = "149hxzgm1awa9rn9z8f9pgwy2i703va549wgkq7sfy77vmir4lzc"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; @@ -211478,6 +213956,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "monadology_0_4" = callPackage + ({ mkDerivation, base, constraints, invariant, tasty, tasty-hunit + , text, transformers, type-rig, witness + }: + mkDerivation { + pname = "monadology"; + version = "0.4"; + sha256 = "0l1bxpws6r132g8baiich90x6sfrsyn66z1ca3akqkfk4p2qbj0r"; + libraryHaskellDepends = [ + base constraints invariant transformers type-rig witness + ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + description = "The best ideas in monad-related classes and types"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "monadplus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -211510,8 +214005,8 @@ self: { pname = "monads-tf"; version = "0.3.0.1"; sha256 = "00jzz9lqpz3s5xwvmc5xi300jkkjv9bk62k0jgwnqfv6py9x5g11"; - revision = "1"; - editedCabalFile = "1036p9bn11xmm7hdwbr9dxz8fr9bqsbw0sma5fbqlyzp18b0qz2v"; + revision = "2"; + editedCabalFile = "1wyfl2w8pfkg233180qlk65kka41iqb2hgxsyx700sfqd4p9vs36"; libraryHaskellDepends = [ base transformers ]; description = "Monad classes, using type families"; license = lib.licenses.bsd3; @@ -211754,6 +214249,33 @@ self: { license = lib.licenses.mit; }) {}; + "mono-traversable_1_0_21_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, foldl + , gauge, hashable, hspec, hspec-discover, HUnit, mwc-random + , QuickCheck, split, text, transformers, unordered-containers + , vector, vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.21.0"; + sha256 = "1kf5qwicr8ld4bgkzijxwpzppfwdr4wsl1rg8009a5n06jikxnad"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck text + transformers unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq gauge mwc-random text vector + ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -212109,47 +214631,45 @@ self: { "monomer-flatpak-example" = callPackage ({ mkDerivation, async, base, bytestring, c2hs, containers - , data-default-class, dbus, desktop-portal, directory, file-io - , filepath, libpipewire, libspa, modern-uri, monomer - , monomer-hagrid, random, text + , data-default, dbus, desktop-portal, directory, file-io, filepath + , modern-uri, monomer, monomer-hagrid, pipewire, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.15.6"; - sha256 = "1pzijzrr410yclc7b7hqrbggczj7jl39mm4z6iymvza46mj969pw"; + version = "0.0.16.0"; + sha256 = "1a4kzy96b9rpl8r87im3whl3j59xbs8iqcjn208d0r0yvkmfqd30"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base bytestring containers data-default-class dbus - desktop-portal directory file-io filepath modern-uri monomer - monomer-hagrid random text + async base bytestring containers data-default dbus desktop-portal + directory file-io filepath modern-uri monomer monomer-hagrid random + text ]; - executablePkgconfigDepends = [ libpipewire libspa ]; + executablePkgconfigDepends = [ pipewire ]; executableToolDepends = [ c2hs ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "monomer-flatpak-example"; - }) {libpipewire = null; libspa = null;}; + }) {inherit (pkgs) pipewire;}; "monomer-hagrid" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, hspec, hspec-discover, lens, monomer, mtl - , stm, text + ({ mkDerivation, base, bytestring, containers, data-default, hspec + , hspec-discover, lens, monomer, mtl, stm, text }: mkDerivation { pname = "monomer-hagrid"; - version = "0.3.2.0"; - sha256 = "1vdc26pcn4f1qpk9iakxkkaqg0h1h1dx7s5jxfd7n9j91454ccpp"; + version = "0.4.0.0"; + sha256 = "0bjy5sjfi3lh9fpxk31vppp4kihxfnxqnk0x7yvsdcpy9gcrjl6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-default-class lens monomer text + base containers data-default lens monomer text ]; testHaskellDepends = [ - base bytestring containers data-default data-default-class hspec - lens monomer mtl stm text + base bytestring containers data-default hspec lens monomer mtl stm + text ]; testToolDepends = [ hspec-discover ]; description = "A datagrid widget for the Monomer library"; @@ -214494,6 +217014,18 @@ self: { broken = true; }) {}; + "mtl-misc-yj" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "mtl-misc-yj"; + version = "0.1.0.4"; + sha256 = "04lrfikgjp6p6f459d0nfarp7ia6q86bx3smn5pyvnhrvhbn4alf"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl ]; + description = "tribial tools about mtl"; + license = lib.licenses.bsd3; + }) {}; + "mtl-prelude" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -215879,10 +218411,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "murmur-hash"; - version = "0.1.0.10"; - sha256 = "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9"; - revision = "1"; - editedCabalFile = "18wlx3hsba3kvpa1z95dz0xglr97lf62irlr6wg6i0613br58sh3"; + version = "0.1.0.11"; + sha256 = "1zkd575b6rgs0js4vsr56hy7xhjmvbwxibiwcm6q2wgz5c9igaki"; libraryHaskellDepends = [ base bytestring ]; description = "MurmurHash2 implementation for Haskell"; license = lib.licenses.bsd3; @@ -216982,8 +219512,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "1.1.5"; - sha256 = "06q07wahvghbalx9dm6dqmrmljlqjzqs46fbmmlp2f2ijz36m024"; + version = "1.1.6"; + sha256 = "1dzin4xk5d6dn1grqh6dagmcwj2q1rycxfsi2l23kbapm26a7m0b"; libraryHaskellDepends = [ base binary blaze-textual bytestring bytestring-lexing crypton crypton-x509 crypton-x509-store crypton-x509-system @@ -217502,10 +220032,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "named"; - version = "0.3.0.1"; - sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "5"; - editedCabalFile = "0yhv6qxdjsip5sd3z2gvwhjfq2n3l9qx6n990xfm4mz0dn935v1f"; + version = "0.3.0.2"; + sha256 = "0glm7kfkim2k94xim0cdbyqpwgw22gwghwv0fzj0i3i70r4id3bv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -218281,10 +220809,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.4"; - sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "12"; - editedCabalFile = "0nlyhp29s2c93d1rflrw4wkzpp98i9zr11fca2vd6z31yc7dg5pg"; + version = "0.4.1"; + sha256 = "1mx4m6dy6fm56xyhm6xjavv4q3188r2xnrnqgvmqf9a5m678yskf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -219571,14 +222097,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_2_4_0" = callPackage + "network_3_2_7_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, stm, temporary }: mkDerivation { pname = "network"; - version = "3.2.4.0"; - sha256 = "16xpkjcp3k22sr7aby35xf5arh0rkq330g70dqaw29v7hb87fw1c"; + version = "3.2.7.0"; + sha256 = "12vjx5nr65x7wz5napj85cvp60l8rh4gwcqc4fdw18rj0rk8wm38"; libraryHaskellDepends = [ base bytestring deepseq directory stm ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -220004,8 +222530,8 @@ self: { ({ mkDerivation, array, base, containers, mtl }: mkDerivation { pname = "network-house"; - version = "0.1.0.2"; - sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7"; + version = "0.1.0.3"; + sha256 = "0k6m3afb23pg0vzfx1w0jbgf9fvqhxxb0w55dn8qbxz9xxqqi45j"; libraryHaskellDepends = [ array base containers mtl ]; description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP"; license = lib.licenses.gpl2Only; @@ -220318,12 +222844,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "network-run_0_4_1" = callPackage + "network-run_0_4_3" = callPackage ({ mkDerivation, base, bytestring, network, time-manager }: mkDerivation { pname = "network-run"; - version = "0.4.1"; - sha256 = "1yl2y910s7b4a31anifl5agba88fwgn4k7958k56nk37hjwj0aq8"; + version = "0.4.3"; + sha256 = "0phx8p1bha12l14d3bdb7kh9wjqn150q3ymvlsr7szmkq8x9vwh6"; libraryHaskellDepends = [ base bytestring network time-manager ]; description = "Simple network runner library"; license = lib.licenses.bsd3; @@ -220601,6 +223127,8 @@ self: { pname = "network-transport-tests"; version = "0.3.3"; sha256 = "1x6gqv09nhqf2ynk3wx308gnwd2qqx7v54vsrlxn27vhajc105jl"; + revision = "1"; + editedCabalFile = "0xly8snwsks44cgkbprf9j9sz5rbkx37gqvb9f77bhs7wwgz22cp"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -221359,8 +223887,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.6.0.0"; - sha256 = "0j2z8k5grxz570gbf931v7b06v1yd94gr3l6wv960xdlwl1145qw"; + version = "0.6.0.1"; + sha256 = "1in397s832ivw5wqvdydbc3j63cmmzvra8lfic6476dpm9k1m8s4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -221789,8 +224317,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.20"; - sha256 = "0p45fp1bl7n6yqwwlyy2cnmrj8ijq773hb5rqrzvb2n89wvilaga"; + version = "1.0.21"; + sha256 = "0c9v9n75p1zfr546l2h2n0d42whyr1xm5whq86a22inmjqrbbq4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222354,8 +224882,8 @@ self: { ({ mkDerivation, base, Cabal, cabal-doctest, doctest, ghc }: mkDerivation { pname = "no-recursion"; - version = "0.1.2.0"; - sha256 = "1asf13irq2py0pjd20l8kncxjj1mv0di9kbsjj0czpj51nqvmsvf"; + version = "0.1.2.2"; + sha256 = "0vdj0j29xlynv2n1z9gqk7yxh3kfynpyvj59kmpkbg8z3qhcrcg3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base doctest ]; @@ -222673,8 +225201,8 @@ self: { pname = "non-empty"; version = "0.3.5"; sha256 = "0xnxisshns862l5khb70i6pkzc9l95j33vkqlk046xl6galcxdvd"; - revision = "1"; - editedCabalFile = "15rjy9al76b001qd5nyzfpadxwhhsla02q50pm8d5p1a9y4z0vzp"; + revision = "2"; + editedCabalFile = "1zppyd9xf3wrdawcf92blv7ncf5p0jria8ki72k2ydj56097knpx"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -223211,6 +225739,8 @@ self: { pname = "nothunks"; version = "0.3.0.0"; sha256 = "0fnwad49mv0q46wrnapkqh4hm4rm43gw0papppqrg0z96r658yc4"; + revision = "1"; + editedCabalFile = "08w1sgh8z7i24623bx7lkhap80zmfhs4kfxgylsvz0zb8hbg7gvp"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector wherefrom-compat @@ -223628,8 +226158,8 @@ self: { }: mkDerivation { pname = "nri-redis"; - version = "0.2.0.2"; - sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; + version = "0.2.0.3"; + sha256 = "17rpdmqqfv6iyhjjf7lrr6hbn0mlz71i8llx7617d3v34y1bh3r0"; libraryHaskellDepends = [ aeson async base bytestring conduit containers cryptohash-sha1 haskell-src-meta hedis megaparsec modern-uri nri-env-parser @@ -223943,14 +226473,12 @@ self: { }) {}; "numbered-semigroups" = callPackage - ({ mkDerivation, base, call-stack, semigroups }: + ({ mkDerivation, base, call-stack, semigroups, tagged, void }: mkDerivation { pname = "numbered-semigroups"; - version = "0.1.0.0"; - sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; - revision = "3"; - editedCabalFile = "1qi8cdying5l7anffawxjyjrqpvngg95aj646ahxr6wd9i96pwka"; - libraryHaskellDepends = [ base call-stack semigroups ]; + version = "0.1.1.0"; + sha256 = "0wbc1rzk7s5iaqxl6ck1jpizkqn71yx6lrxlrs103n7pyn1f0qrp"; + libraryHaskellDepends = [ base call-stack semigroups tagged void ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = lib.licenses.lgpl3Only; }) {}; @@ -224142,6 +226670,7 @@ self: { ]; description = "Unified interface to various numerical optimization algorithms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "numeric-optimization-ad" = callPackage @@ -224163,6 +226692,7 @@ self: { ]; description = "Wrapper of numeric-optimization package for using with AD package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "numeric-optimization-backprop" = callPackage @@ -224463,6 +226993,26 @@ self: { broken = true; }) {}; + "numhask-space_0_12_0_0" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , doctest-parallel, numhask, random, semigroupoids, tdigest, text + , time, vector + }: + mkDerivation { + pname = "numhask-space"; + version = "0.12.0.0"; + sha256 = "1g8ccb1lyg7dx3j49d3ry014a64myday7gxxkss1nicim07by9ih"; + libraryHaskellDepends = [ + adjunctions base containers distributive numhask random + semigroupoids tdigest text time vector + ]; + testHaskellDepends = [ base doctest-parallel ]; + description = "Numerical spaces"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "numhask-test" = callPackage ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty , tasty-quickcheck @@ -224574,14 +227124,12 @@ self: { , free, hspec, hspec-discover, microlens, microlens-th , neat-interpolation, optparse-simple, parsec, prettyprinter , regex-tdfa, shake, stm, text, toml-reader, transformers, unliftio - , unordered-containers, validation-selective + , unordered-containers }: mkDerivation { pname = "nvfetcher"; - version = "0.6.2.0"; - sha256 = "0lgbnam9gb9sdgmbxc5iznzbyv13s27j7s74fnrp09xdij0fgq3q"; - revision = "1"; - editedCabalFile = "0rhp4m54s2cmkhzkbphm0xdmvhymzlj3h1dd7iphqf32ba7jljgr"; + version = "0.7.0.0"; + sha256 = "0idcca3g1rfm8rc7zy68pdbhv4s0npdzdb47ixj0hk2pr8rg51ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224595,7 +227143,6 @@ self: { containers data-default extra free microlens microlens-th neat-interpolation optparse-simple parsec prettyprinter regex-tdfa shake text toml-reader transformers unordered-containers - validation-selective ]; testHaskellDepends = [ aeson aeson-pretty async base binary binary-instances bytestring @@ -225538,8 +228085,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.8"; - sha256 = "1bimn9jq8nw152jgb4la1cczz6c9ij8hf2xjg59z6inq4ssgyjl9"; + version = "1.0.9"; + sha256 = "15wijk3dhncjwwmizqj9q1i32bjcidgy9lv2pq0bf2iqccyqc9nc"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -225585,8 +228132,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.4.1"; - sha256 = "1r9yj862azfg4xngp0ghr9i6zawdaw4gkqb4nl6dpalsc7w0lx8w"; + version = "1.5.0"; + sha256 = "1gnk0lc02mw2gml9c8xr7g50nbsilm3wj1b5f3r7aiyk3j9i1fvl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -225604,17 +228151,17 @@ self: { , ogma-extra, ogma-language-c, ogma-language-cocospec , ogma-language-copilot, ogma-language-jsonspec, ogma-language-smv , ogma-spec, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , test-framework-quickcheck2, text }: mkDerivation { pname = "ogma-core"; - version = "1.4.1"; - sha256 = "1g2696iip5sshwgpf9rq769ivqrxc5km1rq0b2q50y91qfh583c9"; + version = "1.5.0"; + sha256 = "1cr09v5dbbn21b57kq79nbs7plcw9qplj5c2mhghg5dsqnzflhb7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring filepath mtl ogma-extra ogma-language-c ogma-language-cocospec ogma-language-copilot ogma-language-jsonspec - ogma-language-smv ogma-spec + ogma-language-smv ogma-spec text ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -225626,15 +228173,16 @@ self: { }) {}; "ogma-extra" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , QuickCheck, test-framework, test-framework-quickcheck2 + ({ mkDerivation, aeson, base, bytestring, Cabal, directory + , filepath, microstache, QuickCheck, test-framework + , test-framework-quickcheck2, text }: mkDerivation { pname = "ogma-extra"; - version = "1.4.1"; - sha256 = "0mipcd5pyi0qxcsb0nhcb57rz7c64m2d36jq08sfvnfa161nhkx9"; + version = "1.5.0"; + sha256 = "05n874zfzqjwvlmqj098rn696l8fj9krgjzw46c2vqzzp0ahavdi"; libraryHaskellDepends = [ - base bytestring Cabal directory filepath + aeson base bytestring Cabal directory filepath microstache text ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -225649,8 +228197,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.4.1"; - sha256 = "0pnpafz2zmzylq7gzgpzx9358h2lfy3hhpz5wz0fiihh8rfakjgd"; + version = "1.5.0"; + sha256 = "1j4sizmahy55rh7f501m4gbvg6c9nbhamhzj6bqhpx2lsy3z0k6l"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225668,8 +228216,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.4.1"; - sha256 = "16j2pqjymr03xkjc5fy2c0hp6c21j557c86ymhlmisy4hkd18195"; + version = "1.5.0"; + sha256 = "09gmyiak2xxwznqznf0p4z3g2jmsb96zj8xk8yprc3ql299k3sj7"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225685,8 +228233,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.4.1"; - sha256 = "0v2nw4mk891faayhvww2qjlrxfcqsgy2ha9zagaby2mfb5q1avh9"; + version = "1.5.0"; + sha256 = "19wv5xm649lflfipj6irjax628wah5vzl9f3ifshq14s353lyxi4"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -225740,8 +228288,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.4.1"; - sha256 = "1bl4ypyj3q6xy1dnfpywbii51521vf5la19jmy82scql9vs9y8rm"; + version = "1.5.0"; + sha256 = "09w4xywcvilyw4yxhz4p2nmix46nhxnljlrbjdkzf0ban2b8kkhd"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -225757,8 +228305,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.4.1"; - sha256 = "0jwsqamnqnvy2id1js61a2xkxr5vj6w5xlpfqh0m1qqsgp2qg5kw"; + version = "1.5.0"; + sha256 = "1lhllgwibv9hprwlbp3bf29pykbzfmyfifd2gz1jzrhm6cdmysc2"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225774,8 +228322,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.4.1"; - sha256 = "0a0fdx1hpvncyaxsalknkwv8ms2a0p9giazgpkrikr4p14rb771k"; + version = "1.5.0"; + sha256 = "01xrmy7xm025ylbchgzbpg4dmd74k0fsrdl03nn8ip7fp1mzwn83"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -225967,18 +228515,23 @@ self: { }) {}; "ollama-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-types - , silently, tasty, tasty-hunit, text, time + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , directory, filepath, http-client, http-types, silently, tasty + , tasty-hunit, text, time }: mkDerivation { pname = "ollama-haskell"; - version = "0.1.0.2"; - sha256 = "12m9ar8fyfxj2bd2q6qgslmyh85fxzqvh09mgvxskdb14yxzil1c"; + version = "0.1.2.0"; + sha256 = "1y2hvjqn22d9d6lpsv95yrjkrzhkqp750d1rnysx8kdkxq59zz31"; libraryHaskellDepends = [ - aeson base bytestring http-client http-types text time + aeson base base64-bytestring bytestring directory filepath + http-client http-types text time ]; - testHaskellDepends = [ base silently tasty tasty-hunit text ]; - description = "Ollama Haskell library"; + testHaskellDepends = [ + aeson base base64-bytestring bytestring directory filepath + http-client http-types silently tasty tasty-hunit text time + ]; + description = "Haskell bindings for ollama"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -226446,8 +228999,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "one-line-aeson-text"; - version = "0.1.0.5"; - sha256 = "10ngmv4xbz5w4fpgprrii6n74syia824sysja7ajyv27v6zfbihf"; + version = "0.1.0.6"; + sha256 = "145nnqb2hyhj8fiizkdka33728riw1xqy0i7wsvqhiqq2mhwhm6q"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Pretty-printing short Aeson values as text"; @@ -226707,37 +229260,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.10.3.1"; - sha256 = "1cv9p6kpb5i4x9bc8ak9vyfvhnqmycf8gbhaf4f6xb6rzwvllvd9"; - revision = "1"; - editedCabalFile = "192hpyb8a0vs7w4l0rq2j2ahqjip5m85w2ic63pn5sskmqcpaxb3"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_10_4_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -226749,6 +229271,8 @@ self: { pname = "opaleye"; version = "0.10.4.0"; sha256 = "16sj1kim44g93cnxkw26hp203ib7pkyzscalk5rfnlz409s1jhp9"; + revision = "2"; + editedCabalFile = "1q33108zah4x7jivihg2455c9zyjwfya0vqbfjqmys9w5ld4ihbm"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -226764,7 +229288,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -227049,6 +229572,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "open-witness_0_7" = callPackage + ({ mkDerivation, base, constraints, hashable, random, tasty + , tasty-hunit, template-haskell, transformers, witness + }: + mkDerivation { + pname = "open-witness"; + version = "0.7"; + sha256 = "1scdc8qxlq2yxk819h58b7daqmb3a934f0jh3vjikb1lax9gxgky"; + libraryHaskellDepends = [ + base constraints hashable random template-haskell transformers + witness + ]; + testHaskellDepends = [ base tasty tasty-hunit witness ]; + description = "open witnesses"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "openai-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, containers, cpphs , hspec, http-client, http-client-tls, http-types, openai-servant @@ -227274,8 +229815,6 @@ self: { librarySystemDepends = [ opencascade-occt ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) opencascade-occt;}; "opencc" = callPackage @@ -227882,6 +230421,7 @@ self: { ]; description = "GHC plugin for open telemetry"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "opentelemetry-wai" = callPackage @@ -228381,8 +230921,8 @@ self: { pname = "oplang"; version = "0.5.0.0"; sha256 = "0psk8jyxdhx2spzrx6k3hka7pyb2mhhsdwwk1g4bzgd3hmxnhh5l"; - revision = "1"; - editedCabalFile = "043mxfr8yjhqzagaydyx0l9q326zpjfzji1l4k6vfdv745ibnd68"; + revision = "2"; + editedCabalFile = "0y98xdmycpacylizvwnw5m1ca8ipwmwkb7yzr6jwqr7rdqv1yh50"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228465,8 +231005,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.6.0.2"; - sha256 = "1mwj5x3s40w7rgl6s87l29q47qv26nzrpilr1qfm0xinvrnq6bj2"; + version = "0.8.0.0"; + sha256 = "0wfayv1k0xxl033knm4fjfc77ffijvh75xpg0g5f0bvc5i7kvgyc"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -228776,8 +231316,8 @@ self: { pname = "options"; version = "1.2.1.2"; sha256 = "0jjz7b69qrsrbfz07xq43v70habxk8sj2gdlbkwh0gbifyhqykbf"; - revision = "1"; - editedCabalFile = "134r6x7m7sdp9f594ydb6l0q5rgym7psg3sh20klv2vwfq3fm1ic"; + revision = "2"; + editedCabalFile = "1aqs45xs42hzga0k9fryrj10my7crgbnmyip58vxrfd0s43rqdxq"; libraryHaskellDepends = [ base containers monads-tf ]; testHaskellDepends = [ base containers hspec monads-tf patience ]; doHaddock = false; @@ -229637,8 +232177,8 @@ self: { pname = "ormolu"; version = "0.7.4.0"; sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; - revision = "1"; - editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + revision = "5"; + editedCabalFile = "107p02xhq0gfacc6j8kackqn16a0wnayq7qpi26acvzqqyxhcjxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229673,6 +232213,8 @@ self: { pname = "ormolu"; version = "0.7.7.0"; sha256 = "1069j7cldvqqazmfrpfc6wy816227c5vz7fbq860yfb5h9ycv5ns"; + revision = "1"; + editedCabalFile = "1v8n4kf8wskyizn868k1662rqsd8myhvrjkchb9hiysw9lgja79c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229830,8 +232372,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.6"; - sha256 = "12piw87ypyajhcb45lkrb8nwwg7rrb919dspzifnnrv6zkawgz12"; + version = "2.0.7"; + sha256 = "186b4swiga0nk05np512iw50pz9w88l3bqz47pr241997bykb71k"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -231049,6 +233591,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "palette_0_3_0_4" = callPackage + ({ mkDerivation, array, base, colour, containers, MonadRandom }: + mkDerivation { + pname = "palette"; + version = "0.3.0.4"; + sha256 = "0n8rylfpf9f0fx58c33v4nx8vwkrz8qlqr9xc1agikzh0l7dgksz"; + libraryHaskellDepends = [ + array base colour containers MonadRandom + ]; + description = "Utilities for choosing and creating color schemes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "palindromes" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -231172,7 +233728,7 @@ self: { ]; }) {}; - "pandoc_3_5" = callPackage + "pandoc_3_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -231180,19 +233736,19 @@ self: { , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls - , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl - , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, skylighting, skylighting-core - , split, syb, tagsoup, tasty, tasty-bench, tasty-golden - , tasty-hunit, tasty-quickcheck, temporary, texmath, text - , text-conversions, time, tls, typst, unicode-collation - , unicode-transforms, unix, vector, xml, xml-conduit, xml-types - , yaml, zip-archive, zlib + , http-types, ipynb, jira-wiki-markup, JuicyPixels, libyaml + , mime-types, mtl, network, network-uri, pandoc-types, parsec + , pretty, pretty-show, process, random, safe, scientific + , skylighting, skylighting-core, split, syb, tagsoup, tasty + , tasty-bench, tasty-golden, tasty-hunit, tasty-quickcheck + , temporary, texmath, text, text-conversions, time, tls, typst + , unicode-collation, unicode-transforms, unix, vector, xml + , xml-conduit, xml-types, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.5"; - sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; + version = "3.6"; + sha256 = "1f7rjwgxlhhzpxcm29kgc1c4bzb827vidxh48qvd2bw597ykp5ns"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -231203,8 +233759,8 @@ self: { directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels - mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific skylighting + libyaml mime-types mtl network network-uri pandoc-types parsec + pretty pretty-show process random safe scientific skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -231314,14 +233870,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_5" = callPackage + "pandoc-cli_3_6" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.5"; - sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; + version = "3.6"; + sha256 = "0crqm20rl95g557biqvlsm0yjgn31sfhm5sa9s65sbpzi81cvp07"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231361,10 +233917,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.18.0"; - sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; - revision = "1"; - editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; + version = "0.3.18.1"; + sha256 = "1bzspd7jjn4ypk5vxhifkcfj4b4jm9352k15k2wc5f4xmwlkqdg4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231702,7 +234256,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_3" = callPackage + "pandoc-lua-engine_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers , crypton, data-default, directory, doclayout, doctemplates , exceptions, filepath, hslua, hslua-module-doclayout @@ -231713,8 +234267,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.3"; - sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; + version = "0.4"; + sha256 = "1004cks656pj87q65kcxlmg8jn0wka98c5ygr39hr63y5avwqykg"; libraryHaskellDepends = [ aeson base bytestring citeproc containers crypton data-default doclayout doctemplates exceptions hslua hslua-module-doclayout @@ -231753,6 +234307,29 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck + , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.3.0"; + sha256 = "0d8vfbmgd107b9lq9dq0b39v3dhznqh11j0ci0i8hsb7g3dkks5g"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types safe text + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit + tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -231975,7 +234552,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_9" = callPackage + "pandoc-server_0_1_0_10" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -231983,8 +234560,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.9"; - sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; + version = "0.1.0.10"; + sha256 = "1rsrdx76llipa9xb624d953rinyhm7nfs53ps4qd343yqw8npjjl"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -232136,8 +234713,8 @@ self: { }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.3.2.0"; - sha256 = "0ssq2ckcnnbp4mig9h788lyk164zb5rj2byqmk5vv10y86zbp3nr"; + version = "0.3.2.1"; + sha256 = "0ngc1p0vss6i5s9k5lsk9wf92z3di8qv6n1bgb923lnvs567lwk0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -233034,8 +235611,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "8"; - editedCabalFile = "0c9ychx28pzxdmfz3d3l170zdwd180galkbs901za5pzzl3hpkxr"; + revision = "9"; + editedCabalFile = "109xh71lzvivyvfypflibav8zmrvli41v8zc69vzch3rafn38ywx"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -233123,6 +235700,8 @@ self: { pname = "parameterized-utils"; version = "2.1.9.0"; sha256 = "15yn958adkivyg7qbbbi20ja8smcdjyslkk3mxswl0r0bfgz2y70"; + revision = "1"; + editedCabalFile = "1b6db8ld5svcclg9ydgfz36qia8d6vkgilmkwb4a2i8dz7whiphl"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -233801,21 +236380,20 @@ self: { }) {}; "parser-regex" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , primitive, QuickCheck, quickcheck-classes-base, tasty - , tasty-hunit, tasty-quickcheck, text, transformers + ({ mkDerivation, base, containers, deepseq, ghc-bignum, primitive + , QuickCheck, quickcheck-classes-base, tasty, tasty-hunit + , tasty-quickcheck, text, transformers }: mkDerivation { pname = "parser-regex"; - version = "0.1.0.0"; - sha256 = "1rsq5bb6rx6y99h01d8g2yfn3kjyj60x3f2n9fhzg02v8sbzs4mx"; + version = "0.2.0.0"; + sha256 = "05lb9ljna8zyn268q8y0dyin7qj53hb6fcvsw4dnmlj4j873bwxr"; libraryHaskellDepends = [ - base bytestring containers deepseq ghc-bignum primitive text - transformers + base containers deepseq ghc-bignum primitive text transformers ]; testHaskellDepends = [ - base bytestring containers QuickCheck quickcheck-classes-base tasty - tasty-hunit tasty-quickcheck text + base QuickCheck quickcheck-classes-base tasty tasty-hunit + tasty-quickcheck text ]; description = "Regex based parsers"; license = lib.licenses.bsd3; @@ -233881,20 +236459,17 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring - , charset, containers, mtl, parsec, QuickCheck - , quickcheck-instances, scientific, text, transformers - , unordered-containers + ({ mkDerivation, attoparsec, base, binary, bytestring, charset + , containers, mtl, parsec, QuickCheck, quickcheck-instances + , scientific, text, transformers, unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.11"; - sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; - revision = "2"; - editedCabalFile = "1wx06q6hkib00brrf4rpvbgrcipjmb1g3xhwdqjhkh31skhlimii"; + version = "0.12.12"; + sha256 = "1g16qrhacjzfcja2wn5936xz9bwqs80xxmj189d2lwwyga5m77nx"; libraryHaskellDepends = [ - attoparsec base base-orphans binary charset containers mtl parsec - scientific text transformers unordered-containers + attoparsec base binary charset containers mtl parsec scientific + text transformers unordered-containers ]; testHaskellDepends = [ attoparsec base bytestring parsec QuickCheck quickcheck-instances @@ -234272,10 +236847,8 @@ self: { }: mkDerivation { pname = "paseto"; - version = "0.1.0.0"; - sha256 = "1pcs4p5zxnwdxbvizmiy9cwf57rn0l4yq95yxsfa9zsi0bk9df6f"; - revision = "2"; - editedCabalFile = "01vn6hhqrzlri78kp51fvgfq0ajilcpicr79jdhjbinksxxjaapx"; + version = "0.1.1.1"; + sha256 = "0z3dvcqz7jibz2cgjwami78sf4cpgi39cd16c5hlvali0fj99pqd"; libraryHaskellDepends = [ aeson base base16-bytestring base64-bytestring basement binary bytestring containers crypton deepseq memory mtl parsec text time @@ -234417,16 +236990,16 @@ self: { maintainers = [ lib.maintainers.cdepillabout ]; }) {}; - "password_3_1_0_0" = callPackage + "password_3_1_0_1" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, crypton, doctest, memory, password-types - , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text }: mkDerivation { pname = "password"; - version = "3.1.0.0"; - sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; + version = "3.1.0.1"; + sha256 = "11vy7i86dwks1zx4bw7nnp0wj0a1cz2zs1ir4psjcvq9ayhl9fpp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring crypton memory password-types @@ -234435,7 +237008,7 @@ self: { testHaskellDepends = [ base base-compat base64 bytestring crypton doctest memory password-types QuickCheck quickcheck-instances scrypt tasty - tasty-hunit tasty-quickcheck template-haskell text + tasty-golden tasty-hunit tasty-quickcheck template-haskell text ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; @@ -234581,28 +237154,29 @@ self: { "patat" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory - , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-types, process, QuickCheck, random, skylighting, tasty - , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, vector, wcwidth, yaml + , filepath, goldplate, hashable, mtl, network, network-uri + , optparse-applicative, pandoc, pandoc-types, process, QuickCheck + , random, skylighting, tasty, tasty-hunit, tasty-quickcheck + , terminal-size, text, time, unordered-containers, vector, wcwidth + , yaml }: mkDerivation { pname = "patat"; - version = "0.12.0.1"; - sha256 = "0mpafb16k4jh00ff07qgrqnpyshd8iwpsaaijzijl11sfildxy05"; + version = "0.13.0.0"; + sha256 = "02w6g22012kx098x757609nwwxk50nry2lc1lfxjrp6fsrz5c1nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring - bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc pandoc-types process random - skylighting terminal-size text time unordered-containers vector - wcwidth yaml + bytestring colour containers directory filepath hashable mtl + network network-uri optparse-applicative pandoc pandoc-types + process random skylighting terminal-size text time + unordered-containers vector wcwidth yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-terminal base directory pandoc QuickCheck tasty tasty-hunit - tasty-quickcheck text + ansi-terminal base directory goldplate pandoc QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -234985,6 +237559,8 @@ self: { pname = "pathtype"; version = "0.8.1.3"; sha256 = "0wik0dpqd0bjwpsjwgqzn6cghrjkh5rbv5ggkyj50savh30y9mkj"; + revision = "1"; + editedCabalFile = "1c3qzn30dkfl92i0c67wlr9c8nx75vh02r5w12rr4m0icx3mdc44"; libraryHaskellDepends = [ base deepseq directory doctest-exitcode-stdio QuickCheck semigroups tagged time transformers utility-ht @@ -235015,6 +237591,8 @@ self: { pname = "patience"; version = "0.3"; sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i"; + revision = "1"; + editedCabalFile = "0vldslyv381bmiw9f22wv46jmdcnxcjz5b8xqh8n7h7zzc5qs6j9"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = lib.licenses.bsd3; @@ -235429,6 +238007,8 @@ self: { pname = "pcf-font"; version = "0.2.2.1"; sha256 = "1gzlbdyhcrf7ap6zjd0fvkfwyakvb805198hpb9a86hrs5bih9mj"; + revision = "1"; + editedCabalFile = "0g13mw6zjx01xqglfhkgx1fycqivp5n8gzm1jl11ih8qqs81wpnd"; libraryHaskellDepends = [ base binary bytestring containers vector zlib ]; @@ -236413,23 +238993,25 @@ self: { mainProgram = "perf-explore"; }) {}; - "perf_0_13_0_0" = callPackage - ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl - , numhask-space, optparse-applicative, recursion-schemes, text - , vector + "perf_0_14_0_1" = callPackage + ({ mkDerivation, base, boxes, chart-svg, clock, containers, deepseq + , formatn, mtl, numhask-space, optics-core, optparse-applicative + , prettychart, prettyprinter, recursion-schemes, tasty, tasty-bench + , text, vector }: mkDerivation { pname = "perf"; - version = "0.13.0.0"; - sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; + version = "0.14.0.1"; + sha256 = "01pfgfgqazl734mkkiwr208m66gcbmlp53y0yb6g4yhf6gvadqxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clock containers deepseq formatn mtl numhask-space - optparse-applicative recursion-schemes text vector + base boxes chart-svg clock containers deepseq formatn mtl + numhask-space optics-core optparse-applicative prettychart + prettyprinter recursion-schemes tasty tasty-bench text vector ]; executableHaskellDepends = [ - base clock containers deepseq formatn mtl optparse-applicative text + base containers deepseq mtl optics-core optparse-applicative text ]; benchmarkHaskellDepends = [ base ]; description = "Performance methods and monad"; @@ -237247,6 +239829,8 @@ self: { pname = "persistent-mtl"; version = "0.5.1"; sha256 = "13sz2j3g5vyvfhs97xzmzcb5a83lg4wlzmqnbmwg6l419jpj23fq"; + revision = "1"; + editedCabalFile = "0frfp7hifii11sk85j44rbd4ic0inp2gzzpfdylkbrbpfw32s54d"; libraryHaskellDepends = [ base conduit containers exceptions monad-logger mtl persistent resource-pool resourcet text transformers unliftio unliftio-core @@ -237600,6 +240184,22 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-sql-lifted" = callPackage + ({ mkDerivation, annotated-exception, base, conduit, containers + , esqueleto, mtl, persistent, text, unliftio-core + }: + mkDerivation { + pname = "persistent-sql-lifted"; + version = "0.1.0.0"; + sha256 = "1mkv3219h0lcg51dh94zy8jj83z3nb56f8r4nk5h4n6c2m9sqpx9"; + libraryHaskellDepends = [ + annotated-exception base conduit containers esqueleto mtl + persistent text unliftio-core + ]; + description = "Monad classes for running queries with Persistent and Esqueleto"; + license = lib.licenses.mit; + }) {}; + "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th @@ -238040,6 +240640,33 @@ self: { broken = true; }) {}; + "pg-query" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-contrib + , hspec-discover, hspec-expectations-pretty-diff, lens, pg_query + , proto-lens, proto-lens-protoc, proto-lens-runtime, temporary + , text, typed-process + }: + mkDerivation { + pname = "pg-query"; + version = "0.0.1.1"; + sha256 = "19i2xzpa4g6fhdayjgs8pq2kw1bkjnlhzkshx4an8s9vgahb1crc"; + libraryHaskellDepends = [ + base bytestring lens proto-lens proto-lens-runtime temporary text + typed-process + ]; + librarySystemDepends = [ pg_query ]; + libraryToolDepends = [ proto-lens-protoc ]; + testHaskellDepends = [ + base bytestring hspec hspec-contrib hspec-expectations-pretty-diff + lens proto-lens proto-lens-runtime temporary text typed-process + ]; + testToolDepends = [ hspec-discover proto-lens-protoc ]; + description = "Parse PostgreSQL DDL and DML: Haskell bindings for libpg_query"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {pg_query = null;}; + "pg-recorder" = callPackage ({ mkDerivation, base, bytestring, contravariant, either, hasql , hasql-pool, hspec, optparse-applicative, optparse-text @@ -239220,22 +241847,22 @@ self: { "photoname" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , filepath, heredoc, hsexif, hslogger, mtl, optparse-applicative - , parsec, process, regex-posix, tasty, tasty-hunit - , tasty-quickcheck, time, unix + , filepath, formatting, heredoc, hsexif, hslogger, mtl + , optparse-applicative, parsec, process, regex-posix, tasty + , tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "photoname"; - version = "5.2"; - sha256 = "0sf7hj6xa7bj074jamhm8jribbdjywdgg2z7wxjzmb2aliji5syi"; + version = "5.4"; + sha256 = "01gd6rl1qnidgd8i65syxli0iqv5fsdyp909s1gd2bvya11k7k6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath hsexif hslogger mtl parsec - process time unix + base containers directory filepath formatting hsexif hslogger mtl + parsec process time unix ]; executableHaskellDepends = [ - ansi-wl-pprint base directory filepath heredoc hslogger + ansi-wl-pprint base directory filepath formatting heredoc hslogger optparse-applicative unix ]; testHaskellDepends = [ @@ -242537,19 +245164,17 @@ self: { "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , hashable, kan-extensions, semigroupoids, stm, tagged , transformers, transformers-compat, unordered-containers }: mkDerivation { pname = "pointed"; - version = "5.0.4"; - sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; - revision = "3"; - editedCabalFile = "070yfc5b8rww0zyvpf7jfd0k30p53wdr8mdn289afmfjk1p69kx6"; + version = "5.0.5"; + sha256 = "1wbfpd978pnkrbi05sf0yj6f50flxr9vl5m85xv3y22hzg6rb7gr"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers + semigroupoids stm tagged transformers transformers-compat + unordered-containers ]; description = "Pointed and copointed data"; license = lib.licenses.bsd3; @@ -242976,8 +245601,8 @@ self: { ({ mkDerivation, attoparsec, base, containers, ghc, text }: mkDerivation { pname = "pollock"; - version = "0.1.0.1"; - sha256 = "0ac33p84bizw2b2dndx3jlpwmfd707xcfd7d96ai6if04db43rzr"; + version = "0.1.0.2"; + sha256 = "112knjwg24mq9gigh3jmnhn3mgv51kawy0k8b7ys856429zpbflk"; libraryHaskellDepends = [ attoparsec base containers ghc text ]; description = "Functionality to help examine Haddock information of a module"; license = lib.licenses.mit; @@ -243054,8 +245679,8 @@ self: { ({ mkDerivation, base, requirements }: mkDerivation { pname = "poly-rec"; - version = "0.7.0.2"; - sha256 = "1kysfam03sbwx9kqbnnncrp0sp764zj57sfj6raar8im9wpwpyh9"; + version = "0.7.0.4"; + sha256 = "07542spic4m794l54grmrbpfvcacqr4cm9vw3x1pmji30rw0c2va"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; @@ -243240,6 +245865,8 @@ self: { pname = "polysemy"; version = "1.9.2.0"; sha256 = "1qwy6a59jdlzc2y7f422yvlwvd9spsgbbpm2r7jcasgxiwq3fkr0"; + revision = "1"; + editedCabalFile = "0cfnh4alps028rsn2n1kji0rdld84qf2ah10b8d036mlmbz4vsy0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -243792,6 +246419,8 @@ self: { pname = "polysemy-plugin"; version = "0.4.5.2"; sha256 = "1inl8wk36fyc6m1fp8pyxmrc82bmznr5f1zasfmxj9q5xxbig87f"; + revision = "1"; + editedCabalFile = "1ng4wxna498jrx2y5aa7r00h563846hqmbvj51bhrp4ndqdmkdwk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -244991,16 +247620,16 @@ self: { "posit" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, data-dword, deepseq - , random, scientific, vector, weigh + , random, scientific, time, vector, weigh }: mkDerivation { pname = "posit"; - version = "2022.2.0.0"; - sha256 = "1637dpqfgs4mpl2n8cvzywsdwsv2zw5834k3mmxd5zhq82ai2m0q"; + version = "2022.2.0.1"; + sha256 = "18rvn0h5fn90cmrj4g19nscl4r658v2piif4afbqqn1ylnf99chk"; libraryHaskellDepends = [ base data-dword deepseq random scientific ]; - testHaskellDepends = [ base Chart Chart-cairo ]; + testHaskellDepends = [ base Chart Chart-cairo time ]; benchmarkHaskellDepends = [ base vector weigh ]; description = "Posit Numbers"; license = lib.licenses.bsd3; @@ -245181,6 +247810,8 @@ self: { libraryHaskellDepends = [ base transformers-base unix ]; description = "Bindings to POSIX clock and timer functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "posix-waitpid" = callPackage @@ -246739,6 +249370,43 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-base58" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, ppad-sha256, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-base58"; + version = "0.1.0"; + sha256 = "07ac2cl7m9f9fkv6f99615nqabz682pr057ijk6zg1707l9r5pch"; + libraryHaskellDepends = [ base bytestring ppad-sha256 ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "base58 and base58check encoding/decoding"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-bech32" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, deepseq + , primitive, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "ppad-bech32"; + version = "0.1.2"; + sha256 = "0cd977x9kqvyq2iw4kvnl9ilqm0rm0d0p6dm6wwzaf466p8c89xg"; + libraryHaskellDepends = [ base bytestring primitive ]; + testHaskellDepends = [ + array base bytestring tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + array base bytestring criterion deepseq + ]; + description = "The bech32 and bech32m encodings, per BIPs 173 & 350"; + license = lib.licenses.mit; + }) {}; + "ppad-hmac-drbg" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , criterion, ppad-sha256, ppad-sha512, primitive, tasty @@ -246761,24 +249429,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-ripemd160" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-ripemd160"; + version = "0.1.0"; + sha256 = "0zbrajd0bwqy329nby926q9h3vyidrh0dv06sqk77v7s0hprf7kl"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The RIPEMD-160 hashing algorithm"; + license = lib.licenses.mit; + }) {}; + "ppad-secp256k1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 - , tasty, tasty-hunit, text + , primitive, tasty, tasty-hunit, text, weigh }: mkDerivation { pname = "ppad-secp256k1"; - version = "0.1.0"; - sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; + version = "0.2.1"; + sha256 = "1parw2ah759zpdx7ljnz8jsm59kqwzmsf7p5zv2nxivsw1xc2lgf"; libraryHaskellDepends = [ - base bytestring ppad-hmac-drbg ppad-sha256 + base bytestring ppad-hmac-drbg ppad-sha256 primitive ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring tasty tasty-hunit text ]; benchmarkHaskellDepends = [ - base base16-bytestring bytestring criterion deepseq + base base16-bytestring bytestring criterion deepseq weigh ]; description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; license = lib.licenses.mit; @@ -247895,6 +250580,30 @@ self: { maintainers = [ lib.maintainers.cdepillabout ]; }) {}; + "pretty-simple_4_1_3_0" = callPackage + ({ mkDerivation, base, containers, criterion, mtl + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "4.1.3.0"; + sha256 = "03nhhavr66ikwmkma3mw2a7dz9w0mhaxj49dgf2cf76v3jq1vara"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl prettyprinter prettyprinter-ansi-terminal text + transformers + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "pretty-simple"; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { @@ -247965,21 +250674,28 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, doctest-parallel, markup-parse, numhask-space - , optics-core, text, time, web-rep + , containers, doctest-parallel, filepath, fsnotify, markup-parse + , numhask-space, optics-core, optparse-applicative, text, time + , web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.2.0"; - sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; + version = "0.3.0.0"; + sha256 = "0lchgnqzc59z0hhaq8n0vzqai6xsws6dwspsjbz6aw73zyw8ymx9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - async base box bytestring chart-svg containers markup-parse - numhask-space optics-core text time web-rep + async base box bytestring chart-svg containers filepath fsnotify + markup-parse numhask-space optics-core text time web-rep + ]; + executableHaskellDepends = [ + async base box optics-core optparse-applicative web-rep ]; testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "prettychart-watch"; }) {}; "prettyclass" = callPackage @@ -248105,6 +250821,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-configurable" = callPackage + ({ mkDerivation, base, megaparsec, microlens, mtl + , parser-combinators, prettyprinter, QuickCheck, quickcheck-text + , tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "prettyprinter-configurable"; + version = "1.0.0.0"; + sha256 = "0y5gwg9031kz2ss79pp9d3rwn9sv86srcipyd8mpdsddmd6bivz1"; + libraryHaskellDepends = [ base microlens mtl prettyprinter text ]; + testHaskellDepends = [ + base megaparsec parser-combinators QuickCheck quickcheck-text tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Configurable pretty-printing"; + license = lib.licenses.asl20; + }) {}; + "prettyprinter-convert-ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest , prettyprinter, prettyprinter-ansi-terminal, text @@ -248355,6 +251089,23 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) primecount;}; + "primecount_0_1_0_2" = callPackage + ({ mkDerivation, base, primecount, silently, tasty, tasty-bench + , tasty-hunit + }: + mkDerivation { + pname = "primecount"; + version = "0.1.0.2"; + sha256 = "090k1ks5ax6f8x8dkyjz3p7dp2wlvrrm2g655lh57d16l8h5p7sj"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ primecount ]; + testHaskellDepends = [ base silently tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Bindings to the primecount library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) primecount;}; + "primes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -249137,6 +251888,8 @@ self: { pname = "probability"; version = "0.2.8"; sha256 = "06vaq2wsy63vnsprpz0921v5mdqnhp58h1ly721lwrxyd8lg57hg"; + revision = "1"; + editedCabalFile = "15aj8y5yc1xmmvz1sd9kyaf3vbxzc9xw3wkhk5d3a9yqfn2cy2k5"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -249145,6 +251898,24 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {}; + "probability-polynomial" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , exact-combinatorics, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "probability-polynomial"; + version = "1.0.0.0"; + sha256 = "0xbl0x8z15qpnslx1jh4qqkpvssjgc1dy4b9fj1m6f23dafch6v9"; + libraryHaskellDepends = [ + base containers deepseq exact-combinatorics + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Probability distributions via piecewise polynomials"; + license = lib.licenses.bsd3; + }) {}; + "probable" = callPackage ({ mkDerivation, base, criterion, mtl, mwc-random, mwc-random-monad , primitive, statistics, transformers, vector @@ -249635,8 +252406,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "5"; - editedCabalFile = "137m8dvcyldiqf3d6vgxc2dv33kkj3x7r5w5yvfif4yja59vfvkw"; + revision = "6"; + editedCabalFile = "1sq9cgyqlylbkirw72yk68m86is65rbjpg3cir9vska0skxmdhjs"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -250476,23 +253247,25 @@ self: { pname = "proof-combinators"; version = "0.1.0.0"; sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw"; + revision = "3"; + editedCabalFile = "1xsla1jqh1mfxy4341vwvqc404wdyb0pzp0j2fzjzg7103zrns7d"; libraryHaskellDepends = [ base ]; - description = "Proof Combinators used in Liquid Haskell for Theorem Proving"; + description = "DEPRECATED"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "prop-unit" = callPackage - ({ mkDerivation, base, hedgehog, tasty, tasty-hedgehog, tasty-hunit + ({ mkDerivation, base, containers, hedgehog, tasty, tasty-hedgehog }: mkDerivation { pname = "prop-unit"; - version = "0.1.3"; - sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; + version = "1.0.1"; + sha256 = "083m9lisb5qb1l71wmhv22fmgaf13zfzwxkz312mcgr6ifmm2nxi"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ - base hedgehog tasty tasty-hedgehog tasty-hunit + base containers hedgehog tasty tasty-hedgehog ]; description = "Conveniences for using Hedgehog as a unit test runner"; license = lib.licenses.bsd3; @@ -250597,6 +253370,28 @@ self: { broken = true; }) {}; + "property-matchers" = callPackage + ({ mkDerivation, adjunctions, base, deepseq, hspec, hspec-discover + , lens, pretty-simple, prettyprinter, recover-rtti, semialign + , smallcheck, text, these + }: + mkDerivation { + pname = "property-matchers"; + version = "0.3.0.0"; + sha256 = "0414qvw3ay7ssv4404v3ks68zvnw40wp67s6fx22j0b9msvasq0n"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + semialign text these + ]; + testHaskellDepends = [ + adjunctions base deepseq hspec lens pretty-simple prettyprinter + recover-rtti smallcheck text + ]; + testToolDepends = [ hspec-discover ]; + description = "A library for tests, based on transforming and writing properties"; + license = lib.licenses.bsd3; + }) {}; + "proplang" = callPackage ({ mkDerivation, base, glade, glib, gtk }: mkDerivation { @@ -251373,6 +254168,18 @@ self: { broken = true; }) {}; + "provide" = callPackage + ({ mkDerivation, base, lens, reflection, vinyl }: + mkDerivation { + pname = "provide"; + version = "0.1.0.0"; + sha256 = "0qiz4pqrhdczxsjhsbk0zcfmks31llp4xks7whpalimsk33075qs"; + libraryHaskellDepends = [ base lens reflection vinyl ]; + testHaskellDepends = [ base vinyl ]; + description = "Lightweight dependency injection / namespaced+typed implicit-ish arguments"; + license = lib.licenses.bsd3; + }) {}; + "proxied" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -251783,6 +254590,24 @@ self: { license = lib.licenses.mit; }) {}; + "ptr-poker_0_1_2_16" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog + , isomorphism-class, numeric-limits, rerebase, scientific, text + }: + mkDerivation { + pname = "ptr-poker"; + version = "0.1.2.16"; + sha256 = "15x169xihal3y4is4rcdx7rq4yz62dx6xj864vqs2dhxa819iw0l"; + libraryHaskellDepends = [ base bytestring scientific text ]; + testHaskellDepends = [ + hedgehog isomorphism-class numeric-limits rerebase + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Pointer poking action construction and composition toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ptrdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -252881,8 +255706,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.18"; - sha256 = "08wc8agnxfalixc7d4zlwsh3swanyfgg74180lm4v5i2q6s5jxy4"; + version = "2.1.0.19"; + sha256 = "1zhypjxi3n0zn7l8mkdw17zvm2fsflk8cfnx1bsh0fd5b6a2xj49"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring crypton hashable http-client http-client-tls http-types memory text time @@ -252895,6 +255720,28 @@ self: { license = lib.licenses.mit; }) {}; + "pusher-http-haskell_2_1_0_20" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , crypton, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.1.0.20"; + sha256 = "1yvl6ydgix16jxjj40ga9kq832n96ifywra1l3z8cr8apjm3wyin"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring crypton hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -254292,29 +257139,26 @@ self: { "quic" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, bytestring , containers, crypto-token, crypton, crypton-x509 - , crypton-x509-system, data-default-class, fast-logger, filepath - , hspec, hspec-discover, iproute, memory, network - , network-byte-order, network-control, QuickCheck, random - , serialise, stm, tls, unix-time, unliftio, unliftio-core + , crypton-x509-system, data-default, fast-logger, filepath, hspec + , hspec-discover, iproute, memory, network, network-byte-order + , network-control, QuickCheck, random, serialise, stm, tls + , unix-time }: mkDerivation { pname = "quic"; - version = "0.2.2"; - sha256 = "0bx6bccnfrqm7593mwi1c52pmb2dimxp3pllc6m818bgwrkii61w"; - revision = "2"; - editedCabalFile = "1mkqx0kadpd99d4izkqg7wm86ffvxr0xvz3p424563dx4k1c2apk"; + version = "0.2.7"; + sha256 = "0x6x7xdknwa80ikclfn8mq8jyqgy73l0g8qy82jcgj3jqd4631zq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base16-bytestring bytestring containers crypto-token - crypton crypton-x509 crypton-x509-system data-default-class + array async base base16-bytestring bytestring containers + crypto-token crypton crypton-x509 crypton-x509-system data-default fast-logger filepath iproute memory network network-byte-order - network-control random serialise stm tls unix-time unliftio - unliftio-core + network-control random serialise stm tls unix-time ]; testHaskellDepends = [ async base base16-bytestring bytestring containers crypton hspec - network QuickCheck tls unix-time unliftio + network QuickCheck tls unix-time ]; testToolDepends = [ hspec-discover ]; description = "QUIC"; @@ -254592,7 +257436,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_31" = callPackage + "quickcheck-instances_0_3_32" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , OneTuple, primitive, QuickCheck, scientific, splitmix, strict @@ -254601,10 +257445,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.31"; - sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; - revision = "2"; - editedCabalFile = "1zigggr5i4ikmc34p97x5md1nvpgkwvnvky7saxxsi5w3s3g3zqz"; + version = "0.3.32"; + sha256 = "10zz62j1jplk392c90hkg9mfk8piyp5ify94jp3rld722phg5xa8"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -254638,8 +257480,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.5.1"; - sha256 = "0dsklypvflwgaj6fdh52sw2bzznz1kmmcdbs39nsjji7bkbn7gqp"; + version = "0.6.0"; + sha256 = "1s1z146l00v5hlcmwq9w9dpvs0mblld8h15xicxb619fbl1hrg5x"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -255903,8 +258745,8 @@ self: { }: mkDerivation { pname = "radix-tree"; - version = "1.0.0.2"; - sha256 = "19i156s1b9n5vmzjjbd8z7jix95km0xx7fzrig1gx712yaf9x7rh"; + version = "1.1.0.0"; + sha256 = "17ncmiq82vw5ybgfp0zcv98b03qxpsa20jap54462j9gm6c870nv"; libraryHaskellDepends = [ base bytestring deepseq primitive template-haskell text ]; @@ -256382,6 +259224,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "random_1_2_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl + , primitive, rdtsc, smallcheck, split, splitmix, stm, tasty + , tasty-bench, tasty-hunit, tasty-inspection-testing + , tasty-smallcheck, time, transformers + }: + mkDerivation { + pname = "random"; + version = "1.2.1.3"; + sha256 = "1p2i636bk1q62dzrlrl92mirrz0ynf93bxs5yql07r6ilwk1kj79"; + libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; + testHaskellDepends = [ + base bytestring containers smallcheck stm tasty tasty-hunit + tasty-inspection-testing tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base mtl primitive rdtsc split splitmix tasty-bench time + ]; + description = "Pseudo-random number generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-access-file" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , criterion, directory, lrucaching, mwc-random, random, stm, unix @@ -256831,6 +259696,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ranged-list_0_1_2_3" = callPackage + ({ mkDerivation, base, doctest, ghc-internal + , typecheck-plugin-nat-simple + }: + mkDerivation { + pname = "ranged-list"; + version = "0.1.2.3"; + sha256 = "079h4xvjr4amrr48gljfc438savyvm5qfmnwwz29k8ifavxzxzw1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base ghc-internal typecheck-plugin-nat-simple + ]; + testHaskellDepends = [ + base doctest ghc-internal typecheck-plugin-nat-simple + ]; + description = "The list like structure whose length or range of length can be specified"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rangemin" = callPackage ({ mkDerivation, base, containers, primitive, vector }: mkDerivation { @@ -257413,14 +260298,14 @@ self: { broken = true; }) {}; - "rattletrap_13_1_0" = callPackage + "rattletrap_14_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "13.1.0"; - sha256 = "0niqx3yv215xc2pcy1hnfxrmqqclmz4h33swm8wnf1ddwajh3q9d"; + version = "14.1.0"; + sha256 = "1fkvcdrbw41vc9g2wph0wm0sw2baxx7dkv6cb3x38zvapfynapim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257527,8 +260412,10 @@ self: { }: mkDerivation { pname = "rawlock"; - version = "0.1.0.0"; - sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; + version = "0.1.1.0"; + sha256 = "1hd62m0r6wiwpzm70pydrkvw2ln78436vak1jd0wiqvdh9z35szj"; + revision = "1"; + editedCabalFile = "1gw7ffwhzw650gm2746k88kjhyl7q525mzrqcrj6q8nn9sjabzih"; libraryHaskellDepends = [ base io-classes nothunks strict-mvar strict-stm ]; @@ -257846,8 +260733,8 @@ self: { }: mkDerivation { pname = "rds-data"; - version = "0.1.0.0"; - sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; + version = "0.1.1.1"; + sha256 = "1d3jvwlrr5xdn1dn9s3w4ww1db60rzvhjwc4vgrcjb9fnlqkr7l0"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -258094,8 +260981,8 @@ self: { pname = "reactive-balsa"; version = "0.4.0.1"; sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1"; - revision = "1"; - editedCabalFile = "1lfq84fgq41bych8k4avrzc04lbyl974q7y5z5wd9h9h3sz0i4wa"; + revision = "2"; + editedCabalFile = "1l5mvm1b4y8r1r6lg7h2imrfzl4y1jcc23cjm5bpcrci46n0z006"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -258118,8 +261005,8 @@ self: { pname = "reactive-banana"; version = "1.3.2.0"; sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; - revision = "4"; - editedCabalFile = "1nijajqvp7i5jq99y9c3z969ljgagkarpn5ikbd3bir2msz54pyn"; + revision = "5"; + editedCabalFile = "0dydffvlxf6wlkaj1sf2argrpkfwswjcby2an1rcwrk8gs6dklkv"; libraryHaskellDepends = [ base containers deepseq hashable pqueue semigroups stm these transformers unordered-containers vault @@ -258322,6 +261209,8 @@ self: { pname = "reactive-jack"; version = "0.4.1.2"; sha256 = "1ckm95dr3y14bh73nxapm9rl39bz1lpxmclgcnd9n2mkn0b1q54w"; + revision = "1"; + editedCabalFile = "045aivc9nivky6pgfwdfyffglg6v3i1zv5alk9abj5jmrz6d3pyw"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -258343,8 +261232,8 @@ self: { pname = "reactive-midyim"; version = "0.4.1.1"; sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v"; - revision = "1"; - editedCabalFile = "0bfaylhq9nkx4ay6rx18n7df9illw8gfpv21yxgcyi43yb00560w"; + revision = "2"; + editedCabalFile = "131mg8w6dcjzlmrhr8pmlbk2x4qfnza3chik4ylfzi90bqc147gx"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana-bunch semigroups @@ -258896,6 +261785,8 @@ self: { pname = "rec-def"; version = "0.2.2"; sha256 = "0hrca7v3visyppzzszilydhmrpkwc7hmhm0ld8ha2dd9ijvgrd22"; + revision = "1"; + editedCabalFile = "015ibrylnsmz55syn32dvl40d5n5c0pwk6llk0b36k2ak5ls2s1f"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base concurrency containers dejafu doctest QuickCheck random tasty @@ -259235,6 +262126,8 @@ self: { pname = "recursion-schemes"; version = "5.2.3"; sha256 = "020fk7s4dzim3957h8447mi3jp95k25zrac86dcaavldxjy88kiv"; + revision = "1"; + editedCabalFile = "0la8md7lv8awhvsyw30mqbyfjvskvndcm9446wnh4bhjhi0813li"; libraryHaskellDepends = [ base comonad containers data-fix free template-haskell th-abstraction transformers @@ -259691,6 +262584,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "reducers_3_12_5" = callPackage + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, text, transformers, unordered-containers + }: + mkDerivation { + pname = "reducers"; + version = "3.12.5"; + sha256 = "0742ry9xjjmhwvlv100d3nz75k7wqr42262kw21n5mmwrka6358h"; + libraryHaskellDepends = [ + array base bytestring containers fingertree hashable semigroupoids + text transformers unordered-containers + ]; + description = "Semigroups, specialized containers and a general map/reduce framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reedsolomon" = callPackage ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev , loop, mtl, primitive, profunctors, QuickCheck, random, tasty @@ -259938,8 +262848,8 @@ self: { }: mkDerivation { pname = "refined-containers"; - version = "0.1.0.1"; - sha256 = "0jyk71ccwy489cyikg4a9pvdj8hijyqpkw1sj5qhj0anrsc6bq8x"; + version = "0.1.0.2"; + sha256 = "03kaxj49alqaj4a0miighchpgzsm7yjyzxw2fxjmvq90lyy59524"; libraryHaskellDepends = [ adjunctions base constraints containers deepseq distributive hashable indexed-traversable mtl refined reflection @@ -260026,6 +262936,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflection_2_1_9" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "reflection"; + version = "2.1.9"; + sha256 = "1cwzwncb7zvzdcj5s5pc1qrkh7xj6kyz9b30qq2imvnh3bjdb9y6"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -260833,8 +263759,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.5.2.1"; - sha256 = "1hfvs6igpavzr6cd4mc7asxj2iwhcjzi7mc4fbfwnq1jmll9xp37"; + version = "0.6.1.0"; + sha256 = "0s8xqikz9gcaqax99cn96izqv8srmcxs9d93nz9k3f7ncrb0c5zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261879,8 +264805,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.6.1.0"; - sha256 = "0jn8ylnq7vqpdlz01jn8fndczgz02rgpzhi1g7fy1r0pwln6ibgj"; + version = "0.6.3.0"; + sha256 = "0cid38h4mjsbakbgvasipmagl1myjvmpbk0034n5zb8zy4dkmxkh"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl multimap protolude resourcet semigroupoids semigroups template-haskell text @@ -261908,8 +264834,8 @@ self: { }: mkDerivation { pname = "registry-aeson"; - version = "0.3.0.0"; - sha256 = "1248mszp2wcj9v2djnfliqqhkmsvixwh6j9qwcjj00wvdb7lmzad"; + version = "0.3.1.0"; + sha256 = "09agzi08nrfd6hglcwpacybz8y3z0m6mzf5gf7p26b0fd5f5jg77"; libraryHaskellDepends = [ aeson base bytestring containers protolude registry template-haskell text transformers unordered-containers vector @@ -261932,8 +264858,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.8.1.0"; - sha256 = "10am03sd9xj7a8079z4ikhlm3yf22rv809mk4n9gvhzkycx0dlb9"; + version = "0.8.2.0"; + sha256 = "0larrg1qp15plb6gip0ghs3zdgg022bs90khias9zdcvcw1i1hvw"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -261958,8 +264884,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog-aeson"; - version = "0.3.0.0"; - sha256 = "08k8vdc4hmqnsci2bvacrizlfb98a2yp7h3p5ad8dqn2yhinlbrf"; + version = "0.3.1.0"; + sha256 = "0n8v3zx9ybf8yvniifipbk4f5r8jwg1glmf0i1xay8ssjlziriys"; libraryHaskellDepends = [ aeson base containers hedgehog mmorph multimap protolude registry scientific tasty tasty-discover tasty-hedgehog tasty-th @@ -262215,32 +265141,33 @@ self: { "rel8" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base - , base-compat, base16, bifunctors, bytestring, case-insensitive - , comonad, containers, contravariant, data-dword, data-textual - , hasql, hasql-transaction, hedgehog, mmorph, network-ip, opaleye - , pretty, product-profunctors, profunctors, scientific, semialign - , semigroupoids, tasty, tasty-hedgehog, text, these, time - , tmp-postgres, transformers, utf8-string, uuid, vector + , base-compat, base16, bifunctors, binary-parser, bytestring + , case-insensitive, comonad, containers, contravariant, data-dword + , data-textual, hasql, hasql-transaction, hedgehog, iproute, mmorph + , network-ip, opaleye, pretty, product-profunctors, profunctors + , scientific, semialign, semigroupoids, tasty, tasty-hedgehog, text + , these, time, tmp-postgres, transformers, utf8-string, uuid + , vector }: mkDerivation { pname = "rel8"; - version = "1.5.0.0"; - sha256 = "01g1ras7byy05x99gzh3pj4xzsm1qxx3j6qiy1qnzhvrwjifbc5w"; + version = "1.6.0.0"; + sha256 = "1ljw3zihy3d3nihfc8f791h5bggd2r4gb8vq2zraa8s7brml3bx9"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base base-compat base16 - bifunctors bytestring case-insensitive comonad contravariant - data-textual hasql network-ip opaleye pretty product-profunctors - profunctors scientific semialign semigroupoids text these time - transformers utf8-string uuid vector + bifunctors binary-parser bytestring case-insensitive comonad + contravariant data-dword data-textual hasql iproute network-ip + opaleye pretty product-profunctors profunctors scientific semialign + semigroupoids text these time transformers utf8-string uuid vector ]; testHaskellDepends = [ - base bytestring case-insensitive containers data-dword hasql - hasql-transaction hedgehog mmorph network-ip scientific tasty - tasty-hedgehog text time tmp-postgres transformers uuid + aeson base bytestring case-insensitive containers data-dword hasql + hasql-transaction hedgehog iproute mmorph network-ip scientific + tasty tasty-hedgehog text time tmp-postgres transformers uuid + vector ]; description = "Hey! Hey! Can u rel8?"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -262562,6 +265489,32 @@ self: { broken = true; }) {}; + "relocant" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, crypton, directory + , envparse, filepath, hspec, memory, optparse-applicative + , postgresql-simple, process, random, temporary, text, time + }: + mkDerivation { + pname = "relocant"; + version = "1.0.0"; + sha256 = "1iazymf953msr6d7dn99slw12wmnivnx5nfzjbq8h4f84ybwmvr6"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson base bytestring crypton directory envparse filepath memory + optparse-applicative postgresql-simple process text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring filepath hspec postgresql-simple random temporary + text + ]; + description = "A PostgreSQL migration CLI tool and library"; + license = lib.licenses.bsd2; + mainProgram = "relocant"; + }) {}; + "reloto" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -262587,6 +265540,8 @@ self: { pname = "relude"; version = "1.2.2.0"; sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; + revision = "1"; + editedCabalFile = "1n8zhdz9cf6swbnmfncmzjddxqicvn54w229q3xpad0lyyr67ly6"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -262867,8 +265822,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, optics, parsec }: mkDerivation { pname = "reorder-expression"; - version = "0.1.0.1"; - sha256 = "1jb7222r6mv9lvjfihbj96aj6vw3vqjsr283d4shv8qw3ghiqpl2"; + version = "0.1.0.2"; + sha256 = "1538lw1y56rqcxkpa2jcwm2zqx03ajfa1km1h2f2nsvrdr0f57a6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec optics parsec ]; testToolDepends = [ hspec-discover ]; @@ -262901,10 +265856,8 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.4.1.5"; - sha256 = "0saa2r94l0x52dlj9402csah96akp5wlc0xaah9p2pb8fv3yvs11"; - revision = "1"; - editedCabalFile = "1bl3q9x6lkkdwb5190nlxwzdil9vww99y57yhr1lab6bzr5qys0q"; + version = "3.4.2.0"; + sha256 = "1rqwmpslwqhrwgkpsqhx3hm4z41vfl35h7qkdxds44125d54kwcq"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -262916,8 +265869,8 @@ self: { ({ mkDerivation, base, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.4.1.5"; - sha256 = "0j6vbmwkjx8k0s754pccsmrdw5bkydxwbrli8lhlvxjcrrmbc26l"; + version = "3.4.2.0"; + sha256 = "12xj1n15abqmlcd0wczmv9f32jsbzh519jhzpv2zja9db1az43wv"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; license = lib.licenses.bsd3; @@ -262969,6 +265922,7 @@ self: { description = "Packing and unpacking flat tables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "repa-devil" = callPackage @@ -262986,16 +265940,14 @@ self: { }) {inherit (pkgs) libdevil;}; "repa-eval" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base }: mkDerivation { pname = "repa-eval"; - version = "4.2.3.1"; - sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "4.2.4.0"; + sha256 = "1irfr5x4cmr85hsar6smj71icj687zic37y5xlyd3jp9r9k4zqn1"; + libraryHaskellDepends = [ base ]; description = "Low-level parallel operators on bulk random-accessble arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-examples" = callPackage @@ -263004,10 +265956,8 @@ self: { }: mkDerivation { pname = "repa-examples"; - version = "3.4.1.2"; - sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d"; - revision = "3"; - editedCabalFile = "149wg57xkbnqymcmbd7i20kj37zyz0a4qm9426nkrrhkvs1acx52"; + version = "3.4.2.0"; + sha256 = "0qifi5n5pa8265yd2ylwd3knaw9lz263b96r49chz5rgr3bcsza0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -263065,8 +266015,8 @@ self: { }: mkDerivation { pname = "repa-io"; - version = "3.4.1.2"; - sha256 = "0y4b8mfzlbf38f8mqnzq4vyvq8vw2vri8w0sb7dpr4bk0sd7gsmj"; + version = "3.4.2.0"; + sha256 = "05a4mcgpmzjj2yg9fc9ydz91wk31i7mg4b129bwf35j4ds68w2wi"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -263110,17 +266060,13 @@ self: { }: mkDerivation { pname = "repa-scalar"; - version = "4.2.3.3"; - sha256 = "1qjzrmz010gm50in0yja817r6wl0n2iybd00dsfpcspdaq91ahvb"; - revision = "1"; - editedCabalFile = "14p7m3fyl3h6asxcb3lh67f3ypw85109fxfag5aycdr39g5xa6rm"; + version = "4.2.4.0"; + sha256 = "1k11sav67hkc302gg5f8fxs6zw0gbbfxsgbl9lfxx992fv62sfiv"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; description = "Scalar data types and conversions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-series" = callPackage @@ -263164,6 +266110,7 @@ self: { description = "Stream functions not present in the vector library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "repa-v4l2" = callPackage @@ -263510,6 +266457,8 @@ self: { pname = "req"; version = "3.13.4"; sha256 = "0s80kl29b7d35v044yvkfa6ja40k4sm3wh26qpnscqzv2n6w8zzk"; + revision = "1"; + editedCabalFile = "0hjqbxmvvrw7bslq98kyyiqgl6d70cddddx8g0g6b1f3ffd1vw9n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -263678,8 +266627,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "require-callstack"; - version = "0.2.0.0"; - sha256 = "15zy46r66qslmqpirydnzkqy8s241kzzp6wiqksi29gzipbzgha3"; + version = "0.2.0.1"; + sha256 = "1w252bqy2fi6y8adhwcpw896rb3gnxjc1yqggnxlx8fkj0z6i3gm"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "Propagate HasCallStack with constraints"; @@ -263690,8 +266639,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "requirements"; - version = "0.7.0.2"; - sha256 = "0291av4vixsns5w55yff4vjd8mr2wr8fpm26ckx903sll0y982ix"; + version = "0.7.0.3"; + sha256 = "15sydfl3dss62qld27l0hvzvvs577sgzlqkax4bigbpy231mj03s"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; @@ -263708,8 +266657,8 @@ self: { pname = "rere"; version = "0.2.0.1"; sha256 = "1cbdn8jz1zcbddc0b4ahln1k7vwg0npxhmnmqaasm3byrrr6l271"; - revision = "2"; - editedCabalFile = "0rcyzp97igfphbrd0yavlajw3fq5872mjak5lvliw771cwv7v1kr"; + revision = "3"; + editedCabalFile = "1b29gpv9zxar9rjz8z0ksyw0h56jyrfzk9ja6zfk6qmw3nj4kf3p"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -263901,8 +266850,8 @@ self: { pname = "resolv"; version = "0.2.0.2"; sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "3"; - editedCabalFile = "0i9h81lrl0gdk6i1yrg2kqdx89fzr0wb29b6p7g2y3bnnmd2cs28"; + revision = "4"; + editedCabalFile = "0xr36sf4ivlxvhsfxj51zbm1pjgs4j5xby6pzjfyrl74c89nw69y"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -265256,20 +268205,22 @@ self: { "rhine" = callPackage ({ mkDerivation, automaton, base, containers, criterion, deepseq - , free, mmorph, monad-schedule, MonadRandom, mtl, profunctors - , QuickCheck, random, selective, simple-affine-space, sop-core - , tasty, tasty-hunit, tasty-quickcheck, text, time, time-domain - , transformers, vector-sized + , foldable1-classes-compat, free, mmorph, monad-schedule + , MonadRandom, mtl, profunctors, QuickCheck, random, selective + , simple-affine-space, sop-core, tasty, tasty-hunit + , tasty-quickcheck, text, time, time-domain, transformers + , vector-sized }: mkDerivation { pname = "rhine"; - version = "1.4.0.1"; - sha256 = "1878fwyvghm0k9ayba88abyf7ca9abgzc03290ldkzwbn2kg5gwg"; + version = "1.5"; + sha256 = "0dkkdkrqbrp1383pl9ak8w121f115ylgp389g5aq7l6j3qyaxjfh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - automaton base containers deepseq free mmorph monad-schedule - MonadRandom mtl profunctors random selective simple-affine-space - sop-core text time time-domain transformers vector-sized + automaton base containers deepseq foldable1-classes-compat free + mmorph monad-schedule MonadRandom mtl profunctors random selective + simple-affine-space sop-core text time time-domain transformers + vector-sized ]; testHaskellDepends = [ automaton base criterion monad-schedule mtl QuickCheck selective @@ -265291,8 +268242,8 @@ self: { }: mkDerivation { pname = "rhine-bayes"; - version = "1.4.0.1"; - sha256 = "1qkk7sn4zgvm817iii1g930w593wwpcm2anrpml29zj9wznllbj0"; + version = "1.5"; + sha256 = "1gia4qh2ark8rlvbbgl5x0kg1jn1x51p2javrmn4sawyw9kvlafz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265314,8 +268265,8 @@ self: { }: mkDerivation { pname = "rhine-gloss"; - version = "1.4.0.1"; - sha256 = "02yrmkl1zl3kys0jzkgz23ah8jwqilbkpijsh4fk8cv16ar9nmgw"; + version = "1.5"; + sha256 = "0aq92p42c94bfijgv25x2i24xf9vh6srzfghskpd2jl70wfakwxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265334,8 +268285,8 @@ self: { }: mkDerivation { pname = "rhine-terminal"; - version = "1.4.0.1"; - sha256 = "1rzs3mcq489kky55m0cljflqcaw53mzrg0ysnf4snpi41vmp3gh6"; + version = "1.5"; + sha256 = "18b0c5nzndwxixb6x31c7rav9mjad6zi4xqarxc1r4qvx3b31r6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266511,8 +269462,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.7"; - sha256 = "0krmqznkkrq16bf78hs98ck6793nl68sn6lb5dv6skn8f10pzyfg"; + version = "0.4.1.8"; + sha256 = "0f6s07zdzjjhx4vk2khrh6y2mhfgjxlg3y3l07riiy171qzp9gkd"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -267044,6 +269995,63 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ronn" = callPackage + ({ mkDerivation, base, filepath, hspec, hspec-golden, text }: + mkDerivation { + pname = "ronn"; + version = "1.1.1.0"; + sha256 = "0hrahajjmgfb93z2csyqjzbywv74z0c8yaagq5pbhasmrha2jg2i"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base filepath hspec hspec-golden text ]; + description = "Describe and render Ronn documentation"; + license = lib.licenses.agpl3Only; + }) {}; + + "ronn-envparse" = callPackage + ({ mkDerivation, base, envparse, hspec, ronn, ronn-test }: + mkDerivation { + pname = "ronn-envparse"; + version = "1.0.1.0"; + sha256 = "00vl088d5c64ds9gz979s07zhz65290px4vij7zg4l9hsxhnbnnr"; + libraryHaskellDepends = [ base envparse ronn ]; + testHaskellDepends = [ base envparse hspec ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + + "ronn-opt-env-conf" = callPackage + ({ mkDerivation, base, hspec, opt-env-conf, ronn, ronn-test, text + }: + mkDerivation { + pname = "ronn-opt-env-conf"; + version = "1.0.1.0"; + sha256 = "0s2myfg84d3ki0ls816xvllw2dinyzn7gy7ckk6zgc56jckrbs3y"; + libraryHaskellDepends = [ base opt-env-conf ronn text ]; + testHaskellDepends = [ base hspec opt-env-conf ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + + "ronn-optparse-applicative" = callPackage + ({ mkDerivation, base, hspec, optparse-applicative, ronn, ronn-test + , text + }: + mkDerivation { + pname = "ronn-optparse-applicative"; + version = "1.0.1.0"; + sha256 = "1l8hsdlb2j3c4q1lmz7kxp16z9vky83gai5kl8jqcb6n7is9c5m2"; + libraryHaskellDepends = [ base optparse-applicative ronn text ]; + testHaskellDepends = [ base hspec optparse-applicative ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + "roots" = callPackage ({ mkDerivation, base, tagged }: mkDerivation { @@ -267376,10 +270384,8 @@ self: { }: mkDerivation { pname = "rounded-hw"; - version = "0.4.0"; - sha256 = "1844qb2nsv25ix41jkrcr0n08wa4zsnrn7wpxxavnabi4j7mf8yz"; - revision = "1"; - editedCabalFile = "1h2cxi47xmpmq5bdfd6jq3pag6sg7rqw3qw6577smjzrpydb67l5"; + version = "0.4.0.1"; + sha256 = "0nms0bhjmn5nwhfw0y0iwghhcgzqvgl40p9d41isg63gkvrrf6w1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base deepseq fp-ieee primitive tagged vector @@ -269060,10 +272066,8 @@ self: { }: mkDerivation { pname = "safe-json"; - version = "1.2.0.1"; - sha256 = "1y03smd9fjxqfs5q2zi8138k3aafwx691327xavsa2b7q27bvi5b"; - revision = "2"; - editedCabalFile = "045q097n08h06zq4jv2ccfqdm3dpcz8gs5yp1hryh7lpf304h33p"; + version = "1.2.0.2"; + sha256 = "1zl0f3y1kih1y3i6376rkizd9kfklqxf7lnj3aipn5ph935lljrz"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -270082,6 +273086,83 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_3_0_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, deepseq, directory, exceptions + , filepath, free, haskell-src-exts, microlens, microlens-th + , monad-control, monad-logger, mtl, optparse-applicative + , pretty-show, process, retry, safe, stm, string-interpolate + , template-haskell, text, time, transformers, transformers-base + , unix, unliftio, unliftio-core, vector, vty, vty-crossplatform + }: + mkDerivation { + pname = "sandwich"; + version = "0.3.0.2"; + sha256 = "06ypw3aidlsj86kwavdxw5y3zhivr9ipxv40r6cvmzfql22v9fx8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sandwich-contexts" = callPackage + ({ mkDerivation, aeson, base, conduit, conduit-extra, containers + , crypton-connection, data-default, exceptions, filepath, HTTP + , http-client, http-conduit, http-types, monad-logger, mtl, network + , postgresql-simple, process, random, relude, retry, safe, sandwich + , streaming-commons, string-interpolate, temporary, text, time + , transformers, unix-compat, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "sandwich-contexts"; + version = "0.3.0.1"; + sha256 = "005b2916y6sx8wf82q40iq9jcc7vp2anmlb3pdw0rpwdj8k66pjk"; + libraryHaskellDepends = [ + aeson base conduit conduit-extra containers crypton-connection + data-default exceptions filepath HTTP http-client http-conduit + http-types monad-logger mtl network process random relude retry + safe sandwich streaming-commons string-interpolate temporary text + time transformers unix-compat unliftio unliftio-core vector + ]; + testHaskellDepends = [ + base filepath postgresql-simple relude sandwich string-interpolate + unliftio + ]; + testToolDepends = [ sandwich ]; + description = "Contexts for the Sandwich test library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sandwich-hedgehog" = callPackage ({ mkDerivation, base, exceptions, free, hedgehog, sandwich , string-interpolate, text, time, unliftio, vty @@ -270198,6 +273279,40 @@ self: { mainProgram = "sandwich-webdriver-exe"; }) {}; + "sandwich-webdriver_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, microlens, microlens-aeson, monad-control + , monad-logger, mtl, network, process, random, regex-tdfa, retry + , safe, sandwich, sandwich-contexts, string-interpolate, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, vector, webdriver + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.3.0.0"; + sha256 = "1s4j2i91csn1wplw1vnz7s8kin5v580a7m98yfas8p7nlm9bihp4"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-tdfa retry safe sandwich sandwich-contexts + string-interpolate temporary text time transformers unix unliftio + unliftio-core unordered-containers vector webdriver + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-tdfa retry safe sandwich sandwich-contexts + string-interpolate text time transformers unix unliftio + unliftio-core unordered-containers vector webdriver + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -270710,7 +273825,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_12" = callPackage + "sbv_11_0" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -270719,8 +273834,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.12"; - sha256 = "1siavgsc0a25rl4x22jcff2d9h1bqif4vm1nymz6niglbqnnrsv8"; + version = "11.0"; + sha256 = "1pdyy3mrhyrqacs7snn4dc9drawqij28svn8qlqxx0wr1bwx86gp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -271287,6 +274402,8 @@ self: { pname = "scheduler"; version = "2.0.0.1"; sha256 = "1hdqm04m3n5y3xrhilj0hykrmqdsjz5p6k2p9y1005khkj5dag9f"; + revision = "1"; + editedCabalFile = "1ggvvz62xw0hcvb186xrfrnm4fn3ppkx207kqrzpc4sxwr5zdfl1"; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive pvar unliftio-core ]; @@ -271834,6 +274951,22 @@ self: { mainProgram = "scope-cairo"; }) {}; + "scoped-codensity" = callPackage + ({ mkDerivation, async, base, hspec, temporary, text, transformers + , unliftio, unliftio-core + }: + mkDerivation { + pname = "scoped-codensity"; + version = "0.2.0.0"; + sha256 = "0mkdvwrj4s0x17jr9gv2wnwvs71j00486pbzmv26s20jd2m5a05p"; + libraryHaskellDepends = [ + async base temporary text transformers unliftio unliftio-core + ]; + testHaskellDepends = [ base hspec transformers unliftio ]; + description = "CPS resource allocation but as a Monad and completely safe"; + license = lib.licenses.agpl3Plus; + }) {}; + "scottish" = callPackage ({ mkDerivation, base, data-default, enclosed-exceptions , http-types, lens, mtl, persistent, resource-pool, scotty, stm @@ -273124,8 +276257,8 @@ self: { ({ mkDerivation, base, containers, criterion, doctest, hspec }: mkDerivation { pname = "search-algorithms"; - version = "0.3.2"; - sha256 = "0lkpsr4vwf77slgwxc38xmhkwwxbh360gjqhblysrph7rl9w7sh7"; + version = "0.3.3"; + sha256 = "00b1fxgjg57m6qm8017yvqbs6qvblw4iazir005flzjm6jls12kz"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -273272,15 +276405,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_4_0" = callPackage + "secp256k1-haskell_1_4_2" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.4.0"; - sha256 = "1nba3f1952p229wbjmbpx80h212mmf1njvyxikiw9c4vpkfksx8b"; + version = "1.4.2"; + sha256 = "0b9xff4r63aqkdag7v67h9yxaa023i1mylih9wcjh1qa8lcb9zn6"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -273587,8 +276720,8 @@ self: { }: mkDerivation { pname = "select-rpms"; - version = "0.1.0"; - sha256 = "056an1cn0zx3ibbfx0qpv8aw19vnc8igkhz5phjmvypxzls75qd6"; + version = "0.2.0"; + sha256 = "14w9j0jdjsqqd75ppka418hjy0ns1cf30q65cakz8mv81ycdpslc"; libraryHaskellDepends = [ base directory extra filepath Glob rpm-nvr safe simple-cmd simple-cmd-args simple-prompt @@ -274598,6 +277731,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequence-formats_1_10_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, pipes-zlib, streaming-commons + , tasty, tasty-hunit, transformers, vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.10.0.0"; + sha256 = "1hsmhhrd88r3wan6b1z1x5j9shy3qg36m27g9lks4fvs95hf76yg"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + pipes-zlib streaming-commons transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe pipes-zlib + tasty tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -274867,8 +278024,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.5.5"; - sha256 = "1mgxfx2xb9jh40vaaa28nwszxph0gpx01x0xynypc757igwhvbkv"; + version = "0.5.6"; + sha256 = "00cymqx8jnlanv75kqgb00harhv8prgk23gwwvadqlzdfv119iql"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; @@ -275246,8 +278403,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-swagger" = callPackage @@ -276147,6 +279302,24 @@ self: { broken = true; }) {}; + "servant-hateoas" = callPackage + ({ mkDerivation, aeson, base, constrained-some, http-media, servant + , servant-server + }: + mkDerivation { + pname = "servant-hateoas"; + version = "0.2.2"; + sha256 = "1m6zm7w4y0gzb35fqr4wgma59f2liidp6yjm0pn045xfxnnq2hrw"; + libraryHaskellDepends = [ + aeson base constrained-some http-media servant servant-server + ]; + testHaskellDepends = [ base ]; + description = "HATEOAS extension for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -276177,18 +279350,18 @@ self: { "servant-hmac-auth" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring - , case-insensitive, containers, cryptonite, filepath, hspec + , case-insensitive, containers, crypton, filepath, hspec , hspec-discover, hspec-golden, http-client, http-types, memory , mtl, servant, servant-client, servant-client-core, servant-server , text, transformers, wai, warp }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.6"; - sha256 = "19w7kg39mzrzir8l0qism3zqjgln7wa02zzbdk9swwnfcja8xm1h"; + version = "0.1.8"; + sha256 = "1rlzlc85ixx0lksn81gh6qzrzqv0qazmwp5a89ijf47wrpdqs2hb"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers - cryptonite http-client http-types memory mtl servant servant-client + crypton http-client http-types memory mtl servant servant-client servant-client-core servant-server transformers wai ]; testHaskellDepends = [ @@ -278768,8 +281941,8 @@ self: { pname = "sets"; version = "0.0.6.2"; sha256 = "0xgk04fvfrl8syyg2cf5s2jazmdasjqh3fdsgamxak2wvjpyvf9l"; - revision = "1"; - editedCabalFile = "1qfkr0rcqvqqgnrsjq4blgwha3ylzchcbvhhz65mz44ql71m76g8"; + revision = "2"; + editedCabalFile = "0x5a7mwznvbrxd9fw1gi56nz9ji4apzi9v114i5lsf8hcj62slnn"; libraryHaskellDepends = [ base bytestring commutative composition containers contravariant hashable keys mtl QuickCheck semigroupoids semigroups transformers @@ -278935,8 +282108,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.2.4.0"; - sha256 = "1lpr6kl79kcfxxmnr7hkr2rxk51y599dj4303f1dw7i0vlbm7rfb"; + version = "1.2.5.0"; + sha256 = "1r89d6r6hbby9k4rl21m1hqbyf74lg065xp62r682xmfcczix3hm"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -279058,7 +282231,6 @@ self: { ]; description = "SGF (Smart Game Format) parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sgrep" = callPackage @@ -279171,6 +282343,29 @@ self: { broken = true; }) {}; + "shaderc" = callPackage + ({ mkDerivation, base, bytestring, c-enum, c-struct, data-default + , exception-hierarchy, language-spir-v, mtl, nowdoc, shaderc + , storable-peek-poke, template-haskell + }: + mkDerivation { + pname = "shaderc"; + version = "0.1.0.5"; + sha256 = "01v24hlfpy4yi56rwgw4xvaijqmir76287sp5kq8is5xqr23v34z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-enum c-struct data-default exception-hierarchy + language-spir-v mtl nowdoc storable-peek-poke template-haskell + ]; + libraryPkgconfigDepends = [ shaderc ]; + testHaskellDepends = [ + base bytestring c-enum c-struct data-default exception-hierarchy + language-spir-v mtl nowdoc storable-peek-poke template-haskell + ]; + description = "A collection of tools and libraries for Vulkan shader compilation"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) shaderc;}; + "shadower" = callPackage ({ mkDerivation, base, doctest, filemanip, fsnotify, MissingH, mtl , process, safe, system-filepath, text @@ -280109,6 +283304,32 @@ self: { broken = true; }) {}; + "shebanger" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cabal-doctest + , containers, directory, doctest, filepath, from-sum + , optparse-applicative, pretty-simple, process, QuickCheck, tasty + , tasty-hunit, template-haskell, text, time, unix + }: + mkDerivation { + pname = "shebanger"; + version = "1.0.0.0"; + sha256 = "135darspl4y3vp6q330lnk0ll1732d2ad7a5jhky20b4pc3pa783"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base cabal-doctest ]; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers directory filepath + from-sum optparse-applicative pretty-simple process text time unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest QuickCheck tasty tasty-hunit template-haskell + ]; + description = "Transform a shell script into a series of scripts with only shebang lines"; + license = lib.licenses.bsd3; + mainProgram = "shebanger"; + }) {}; + "sheets" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cassava, composite-base, composite-cassava, text, vector @@ -280241,8 +283462,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.3"; - sha256 = "1hkf1p2qjb5jc7qkizwsrcb16fhnf2jvqg1y17ly0pgr22lkvxf1"; + version = "0.11.0.4"; + sha256 = "1q0fjdsw76507f0abx6vcqhm1khsx8rd4d1nnipfpj4vsp5w1dbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280257,6 +283478,30 @@ self: { maintainers = [ lib.maintainers.danielrolls ]; }) {}; + "shellify_0_11_0_5" = callPackage + ({ mkDerivation, base, containers, data-default, directory, extra + , hspec, hspec-core, HStringTemplate, mtl, raw-strings-qq, shake + , text, unordered-containers + }: + mkDerivation { + pname = "shellify"; + version = "0.11.0.5"; + sha256 = "0anxcifp15wgk7wji6ks9dcvfzy14q0bwkf6ixx6j42rmbs6fssz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory extra HStringTemplate mtl + raw-strings-qq shake text unordered-containers + ]; + executableHaskellDepends = [ base raw-strings-qq text ]; + testHaskellDepends = [ base hspec hspec-core raw-strings-qq text ]; + description = "A tool for generating shell.nix files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "nix-shellify"; + maintainers = [ lib.maintainers.danielrolls ]; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -280369,14 +283614,27 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.3.1"; - sha256 = "1j7skcylpsi4xjh3icp5mvcr1434bcsf8dvha3wd6znn2s2k7wgb"; + version = "0.1.3.2"; + sha256 = "1x0yb53qkckxli8sm5ck82c7lccp6kl79sk5mcxizb13a6ikw542"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec ]; description = "Parse strings into words, like a shell would"; license = lib.licenses.mit; }) {}; + "shellwords_0_1_4_0" = callPackage + ({ mkDerivation, base, hspec, megaparsec, text }: + mkDerivation { + pname = "shellwords"; + version = "0.1.4.0"; + sha256 = "0i29na2pyvwgm0fj3zfgpa9g84wkdbdj8ym8ykgr7bzjqnlbl1hk"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec megaparsec ]; + description = "Parse strings into words, like a shell would"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -281205,8 +284463,8 @@ self: { pname = "sign"; version = "0.4.4"; sha256 = "1z9csfbl5h4cprvykszn81xncsry7fama2y3gbgnqr7mq15qziq7"; - revision = "3"; - editedCabalFile = "1yrpjv01zhshi0ri3kn8sclvyry85raxgfggxqg9pab73vqwfz79"; + revision = "4"; + editedCabalFile = "0n7201chgmr5s1g2kshrixmb35mikh1rbxqnl5jq7xhx3p7kkjff"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -281398,8 +284656,8 @@ self: { ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: mkDerivation { pname = "silently"; - version = "1.2.5.3"; - sha256 = "0wk3yci4r9v0vwyzylj3k07damz17jwc6n6imwqahf4lsapsz7ds"; + version = "1.2.5.4"; + sha256 = "0vkl2998n3g3vnzh08vp2lnaavdfk14n0wf7gl04n061cn4n08sy"; libraryHaskellDepends = [ base deepseq directory ]; testHaskellDepends = [ base deepseq directory nanospec temporary ]; description = "Prevent or capture writing to stdout and other handles"; @@ -282173,6 +285431,32 @@ self: { broken = true; }) {inherit (pkgs) pango;}; + "simple-pango_0_1_0_2" = callPackage + ({ mkDerivation, array, base, bytestring, c-enum, c-struct + , containers, glib, glib-stopgap, pango, primitive, simple-cairo + , template-haskell, text, union-angle, union-color + }: + mkDerivation { + pname = "simple-pango"; + version = "0.1.0.2"; + sha256 = "00663zd0699rfc8sk769abyb7xlnwls6xqpzigkrrhvf6pv5s7mv"; + libraryHaskellDepends = [ + array base bytestring c-enum c-struct containers glib-stopgap + primitive simple-cairo template-haskell text union-angle + union-color + ]; + libraryPkgconfigDepends = [ glib pango ]; + testHaskellDepends = [ + array base bytestring c-enum c-struct containers glib-stopgap + primitive simple-cairo template-haskell text union-angle + union-color + ]; + description = "Binding to Pango library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) glib; inherit (pkgs) pango;}; + "simple-parser" = callPackage ({ mkDerivation, base, bytestring, containers, errata, exceptions , mmorph, mtl, nonempty-containers, scientific, tasty, tasty-hunit @@ -282360,8 +285644,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.9.7"; - sha256 = "17arwga9irr5aacf0mrdnp1lw1vqlfl3kzwaaiwcw39idlprdnb4"; + version = "0.9.8"; + sha256 = "0imimkpzbd013gadkg7sc05jr70lffaij4ijzk368iw8xgvgxyf9"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = lib.licenses.bsd3; @@ -283046,6 +286330,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons_3_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singletons"; + version = "3.0.4"; + sha256 = "0rcxb8l9vizpq3xgfsijzlig79dw7gx5cds1kv2qnz8ziwxlncq1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Basic singleton types and definitions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-base" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty @@ -283180,14 +286477,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "singletons-th_3_4" = callPackage + "singletons-th_3_5" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.4"; - sha256 = "1fkfaj04g03sw6zsz553a3zyjrhdv7cw1m2dsqb1plk10fj7zi51"; + version = "3.5"; + sha256 = "13ws4fgaw286a1ym29wlxaqg6330yg6hy2h941dj2p9vpdcsf8za"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -283466,6 +286763,8 @@ self: { pname = "size-based"; version = "0.1.3.3"; sha256 = "1xc31iy57v9hm97hhr26ws2wwsf56gczwnq7q8ckiy5pgw6fmr1g"; + revision = "1"; + editedCabalFile = "0idqj2k42anjwaq0zi6x7iz9jbwy6z3q1zjiml44v2ak21dswxga"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -283707,8 +287006,8 @@ self: { }: mkDerivation { pname = "skeletest"; - version = "0.1.0"; - sha256 = "1bl02qvmxwa2nswi11lhgp6gnyg3jych6qscmwfyw2d9pawpq4d1"; + version = "0.1.1"; + sha256 = "1y01n6g8svwybhq53r6jn7az5r83v1fkw23jrzj3342pyzl579nw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283717,7 +287016,7 @@ self: { parser-combinators pretty recover-rtti template-haskell text transformers unliftio ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ base text unliftio ]; testHaskellDepends = [ aeson base containers directory filepath process text unliftio ]; @@ -283975,6 +287274,33 @@ self: { mainProgram = "skylighting"; }) {}; + "skylighting_0_14_5" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, skylighting-format-ansi + , skylighting-format-blaze-html, skylighting-format-context + , skylighting-format-latex, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.14.5"; + sha256 = "1xs3vhxa8nyn8fm99jzn8cmd3n0y50sjrvy7k05vp5jr5g00zhkc"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core skylighting-format-ansi + skylighting-format-blaze-html skylighting-format-context + skylighting-format-latex + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "skylighting"; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff @@ -284005,6 +287331,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_14_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, case-insensitive, colour, containers, criterion, Diff + , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, transformers + , utf8-string, xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.14.5"; + sha256 = "1bld0xwrbhspycm9ii7rb3c2wnydvc6vmw9q0sxyk6iavsmia0kd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + case-insensitive colour containers directory filepath mtl safe text + transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -284054,6 +287411,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-format-blaze-html_0_1_1_3" = callPackage + ({ mkDerivation, base, blaze-html, containers, skylighting-core + , text + }: + mkDerivation { + pname = "skylighting-format-blaze-html"; + version = "0.1.1.3"; + sha256 = "1rjjfcnq1395zmgxv123yy3khia7swrhcr77h8lg4h5jxgm2rs24"; + libraryHaskellDepends = [ + base blaze-html containers skylighting-core text + ]; + description = "HTML formatter for skylighting syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-format-context" = callPackage ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { @@ -284710,6 +288083,31 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "slynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , matrices, optparse-applicative, random, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.8.0.0"; + sha256 = "1rhp6bkkcqiw8ab82znspdlwrmmm18ksgw3976iqakar04d8yybi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix matrices optparse-applicative random + statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "slynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -285512,6 +288910,8 @@ self: { pname = "smtp-mail"; version = "0.5.0.0"; sha256 = "1slmv6k47aqlnms1gjfvsjs1zw8fymvwb7j8nxpjkm554dxqzbcj"; + revision = "1"; + editedCabalFile = "0mjbrjgr7r42a9f45x4zg1zwij1v20d50x1p4g1s17v49s57hyg3"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring crypton crypton-connection data-default-class filepath memory mime-mail @@ -287927,8 +291327,8 @@ self: { pname = "some"; version = "1.0.6"; sha256 = "1fdzhi2rmcigb1c727dyzfak8rgb77bzfr33k1cp987lbnnhd9pp"; - revision = "1"; - editedCabalFile = "0awhdjzvgrnq37m0c9hy5sya1capi3asns9xf3bjyfgv4zf2cb7i"; + revision = "2"; + editedCabalFile = "1w4xi6k44bjyrvhq70550fwrvqfybrq747aws708q18zsbriandc"; libraryHaskellDepends = [ base base-orphans deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -288187,8 +291587,8 @@ self: { pname = "sound-collage"; version = "0.2.1"; sha256 = "09g63b3k0l30z3lxmcz0zpggqqhnr7m01wh2vpm5v561rbnl8rsi"; - revision = "2"; - editedCabalFile = "0csr699dvsvyf90rcks43naiy5biv1awqj0ah4y8vnkyz261n8l5"; + revision = "3"; + editedCabalFile = "09slv6fqrkbhr1jn7h8xs0cxhdaq3r6cy1xar3vp8dil4hc6v3j8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -288326,6 +291726,8 @@ self: { pname = "sox"; version = "0.2.3.2"; sha256 = "1ys6xm08gr3pvyrial2z1b3gvyd44b9510dpp4ifxqf882igkjgb"; + revision = "1"; + editedCabalFile = "1ncmbclz44grdvhx8lgizsp8g8sm97q6vs50sfiwxh1aqwjys7kd"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame semigroups transformers unix utility-ht @@ -289153,8 +292555,8 @@ self: { }: mkDerivation { pname = "specup"; - version = "0.2.0.2"; - sha256 = "19419bzrgaky1ja5isx15fl1xbi9yrxh8i7nd06mh7bmymsprxja"; + version = "0.2.0.4"; + sha256 = "1y57jx5mr1pz0zxmqg3277ba455v47s52ijnvlkr6mqiyy04rawy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289212,6 +292614,8 @@ self: { pname = "speedy-slice"; version = "0.3.2"; sha256 = "1bmy0hrrqgwbqsk1ckbmzy1hhcwlcjsclcskrdmzfq5afvq9kq3z"; + revision = "1"; + editedCabalFile = "1k59vnr20mn9fcjqailnhk5v6z2bbx2c5xym1f5ja93jpyw4vjxb"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -289672,6 +293076,31 @@ self: { license = lib.licenses.bsd3; }) {testu01 = null;}; + "splitmix_0_1_1" = callPackage + ({ mkDerivation, async, base, base-compat-batteries, bytestring + , containers, criterion, deepseq, HUnit, math-functions, process + , random, test-framework, test-framework-hunit, testu01, tf-random + , vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.1.1"; + sha256 = "1iqjxg3jdjmpj6rchnab1scr6b12p1mk7y75ywn06qisc0dc8y6n"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + async base base-compat-batteries bytestring containers deepseq + HUnit math-functions process random test-framework + test-framework-hunit tf-random vector + ]; + testSystemDepends = [ testu01 ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {testu01 = null;}; + "splitmix-distributions" = callPackage ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl , splitmix, transformers @@ -290301,14 +293730,14 @@ self: { }) {inherit (pkgs) sqlite;}; "sqlite-easy" = callPackage - ({ mkDerivation, base, bytestring, direct-sqlite, hspec - , hspec-discover, migrant-core, mtl, resource-pool, text, unliftio - , unliftio-core + ({ mkDerivation, base, bytestring, criterion, deepseq + , direct-sqlite, hspec, hspec-discover, migrant-core, mtl + , resource-pool, text, unliftio, unliftio-core }: mkDerivation { pname = "sqlite-easy"; - version = "1.1.0.1"; - sha256 = "04f83krzb5a806dszhhnyhrxpvh6qr00579cq6h4bhz6bk54ivrz"; + version = "1.1.1.0"; + sha256 = "0w2gb082j2gazay2gvwwksfswwsyh8idvmbnjb0gnbjvq3k2l8nk"; libraryHaskellDepends = [ base bytestring direct-sqlite migrant-core mtl resource-pool text unliftio-core @@ -290317,6 +293746,7 @@ self: { base direct-sqlite hspec hspec-discover text unliftio ]; testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -290713,6 +294143,43 @@ self: { license = lib.licenses.bsd3; }) {}; + "srtree_2_0_0_2" = callPackage + ({ mkDerivation, ad, attoparsec, attoparsec-expr, base, bytestring + , containers, dlist, exceptions, filepath, hashable, HUnit, ieee754 + , lens, list-shuffle, massiv, mtl, nlopt, normaldistribution + , optparse-applicative, random, split, statistics, transformers + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "srtree"; + version = "2.0.0.2"; + sha256 = "1azvqikk4d9rdd2hc96s7bsnzn575w0lvw6xrl1iiv40655xsdzf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-expr base bytestring containers dlist + exceptions filepath hashable ieee754 lens list-shuffle massiv mtl + random split statistics transformers unordered-containers vector + zlib + ]; + librarySystemDepends = [ nlopt ]; + executableHaskellDepends = [ + attoparsec attoparsec-expr base bytestring containers dlist + exceptions filepath hashable ieee754 lens list-shuffle massiv mtl + normaldistribution optparse-applicative random split statistics + transformers unordered-containers vector zlib + ]; + testHaskellDepends = [ + ad attoparsec attoparsec-expr base bytestring containers dlist + exceptions filepath hashable HUnit ieee754 lens list-shuffle massiv + mtl random split statistics transformers unordered-containers + vector zlib + ]; + description = "A general library to work with Symbolic Regression expression trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) nlopt;}; + "srv" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , raw-strings-qq, wai, wai-app-static, warp, warp-tls, yaml @@ -291074,8 +294541,8 @@ self: { pname = "stache"; version = "2.3.4"; sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51"; - revision = "2"; - editedCabalFile = "107iijpd6jzdnbxd8pm2kyj57645h1ax1ynzb3dfsq0akhnmsgx6"; + revision = "3"; + editedCabalFile = "1x7kgp6496jd62pz7d7yf4q1l55fd344cwjfpalxpawc769xgvg4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -291118,6 +294585,8 @@ self: { pname = "stack"; version = "3.1.1"; sha256 = "0iax7ncga64mgkbiy0psjrd603kz8k8m67f718xl4vpyn3m03by4"; + revision = "2"; + editedCabalFile = "13nzc84msj5r09hj9rjbwj3wmfkcv6q618106yq3pq8kyc7d40ap"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -292495,25 +295964,6 @@ self: { }) {}; "static-bytes" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory - , primitive, QuickCheck, rio, text, vector - }: - mkDerivation { - pname = "static-bytes"; - version = "0.1.0"; - sha256 = "00lai18b7wzyy08l6na0lnzpzlwsld7iqfcz2r0l6qbxmdmm3hsx"; - libraryHaskellDepends = [ - base bytestring memory primitive rio vector - ]; - testHaskellDepends = [ - base bytestring hspec memory primitive QuickCheck rio text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; - license = lib.licenses.bsd3; - }) {}; - - "static-bytes_0_1_1" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory , primitive, QuickCheck, rio, text, vector }: @@ -292530,7 +295980,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "static-canvas" = callPackage @@ -293869,6 +297318,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-generic" = callPackage + ({ mkDerivation, base, storable-peek-poke, template-haskell }: + mkDerivation { + pname = "storable-generic"; + version = "0.1.0.5"; + sha256 = "1hzxshar3iw5z8wnwkwmpn2sfjlvrm2cklq04f4drpm8gd10fzch"; + libraryHaskellDepends = [ + base storable-peek-poke template-haskell + ]; + testHaskellDepends = [ base storable-peek-poke template-haskell ]; + description = "Derive Storable instances with GHC.Generics"; + license = lib.licenses.bsd3; + }) {}; + + "storable-hetero-list" = callPackage + ({ mkDerivation, base, hetero-parameter-list, storable-peek-poke }: + mkDerivation { + pname = "storable-hetero-list"; + version = "0.1.0.4"; + sha256 = "12d32lwr4apnv8m5c2kh4n1zmka2vgcigziih4ndcal4m0sh1niz"; + libraryHaskellDepends = [ + base hetero-parameter-list storable-peek-poke + ]; + testHaskellDepends = [ + base hetero-parameter-list storable-peek-poke + ]; + description = "about Storable and Hetero list"; + license = lib.licenses.bsd3; + }) {}; + "storable-offset" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -293882,6 +297361,18 @@ self: { broken = true; }) {}; + "storable-peek-poke" = callPackage + ({ mkDerivation, base, typelevel-tools-yj }: + mkDerivation { + pname = "storable-peek-poke"; + version = "0.1.0.2"; + sha256 = "0pgssxp3fj4bmp9h8hy1w2lxhshqi1x030nhihllvy78kw757zgz"; + libraryHaskellDepends = [ base typelevel-tools-yj ]; + testHaskellDepends = [ base typelevel-tools-yj ]; + description = "class Sizable, Peek and Poke"; + license = lib.licenses.bsd3; + }) {}; + "storable-record" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, transformers , utility-ht @@ -293994,6 +297485,57 @@ self: { pname = "store"; version = "0.7.18"; sha256 = "1qvfh7j1k8gfkllbvln5kfi45n59690yfkzdlazmajji8d8mp8z0"; + revision = "1"; + editedCabalFile = "1wqsr9hx5fxjhqhshffv2x4ahzr07gl2s3bbjipkms43yshrl5ab"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash-sha1 deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash-sha1 deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash-sha1 deepseq directory filepath free ghc-prim hashable + hspec hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh + ]; + description = "Fast binary serialization"; + license = lib.licenses.mit; + }) {}; + + "store_0_7_20" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash-sha1 + , deepseq, directory, filepath, free, ghc-prim, hashable, hspec + , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base + , monad-control, mono-traversable, nats, network, primitive + , resourcet, safe, smallcheck, store-core, syb, template-haskell + , text, th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.7.20"; + sha256 = "1ysp87fhqxw2rlcbhfba1z08j8ml7gq1a1ic6dcl5mdyxxmqywr0"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash-sha1 deepseq @@ -294025,6 +297567,7 @@ self: { ]; description = "Fast binary serialization"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "store-core" = callPackage @@ -294876,8 +298419,8 @@ self: { pname = "streamly"; version = "0.10.1"; sha256 = "1iyvrhjlvfww5jmwdfx58pr5xi9jzv5h22g0nvnhgnrnxhm86sxn"; - revision = "3"; - editedCabalFile = "1g4jv5gq9bn9mb97zqh2g27l77i1ik8qznzv2lc217kylhmnm2gh"; + revision = "4"; + editedCabalFile = "1zd101rz87b9292cazb57qyhm7jy3ia69f80jqw9wjy69bhyihpf"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions hashable heaps lockfree-queue monad-control mtl network @@ -294995,6 +298538,8 @@ self: { pname = "streamly-core"; version = "0.2.2"; sha256 = "10ymikc81grisamk663qkdv8rm32bxfa3p7vi86crq77xhypg56a"; + revision = "1"; + editedCabalFile = "0ygr5wnv6acwg2lcyrrq75gn23bis8k0vdxd2v765bw0yd3aqibj"; libraryHaskellDepends = [ base containers directory exceptions filepath fusion-plugin-types ghc-bignum ghc-prim heaps monad-control template-haskell @@ -295220,6 +298765,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "streams_3_3_3" = callPackage + ({ mkDerivation, adjunctions, base, boring, comonad, distributive + , semigroupoids + }: + mkDerivation { + pname = "streams"; + version = "3.3.3"; + sha256 = "01ns1pj35dm2b04ryn7qrp75wqzrlj7yg3f8wwp150r99z89lqh7"; + libraryHaskellDepends = [ + adjunctions base boring comonad distributive semigroupoids + ]; + description = "Various Haskell 2010 stream comonads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streamt" = callPackage ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty , tasty-hunit @@ -296012,17 +299573,18 @@ self: { }) {}; "string-variants" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, hspec - , hspec-discover, hspec-hedgehog, HUnit, mono-traversable - , QuickCheck, refined, string-conversions, template-haskell, text + ({ mkDerivation, aeson, base, bytestring, deepseq, hashable + , hedgehog, hspec, hspec-discover, hspec-hedgehog, HUnit + , mono-traversable, QuickCheck, refined, string-conversions + , template-haskell, text }: mkDerivation { pname = "string-variants"; - version = "0.3.1.0"; - sha256 = "137ri01lss5ppji7zml50p7sxnd8sfgxc2ka0hn7ki07idaznhwk"; + version = "0.3.1.1"; + sha256 = "11fym4b4qzyylmpgfbdw8v9mcpyya0zmzp2nsyn33a53ljig39g8"; libraryHaskellDepends = [ - aeson base bytestring mono-traversable QuickCheck refined - string-conversions template-haskell text + aeson base bytestring deepseq hashable mono-traversable QuickCheck + refined string-conversions template-haskell text ]; testHaskellDepends = [ aeson base hedgehog hspec hspec-hedgehog HUnit template-haskell @@ -296437,6 +299999,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_13" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.13"; + sha256 = "0wkpc8qlgjga9y7s1y1vmnf0wilh5pycp8fiim744m1wjc2368xg"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path , tasty, tasty-discover, tasty-hspec, tasty-quickcheck @@ -296559,8 +300139,8 @@ self: { pname = "structs"; version = "0.1.9"; sha256 = "033vx729k9jn4w4hs3kp8nlnf0ylsqgg3q4cmb7zjfpgk4bk511w"; - revision = "2"; - editedCabalFile = "1lkx7hflya4v5pkwrf3n01rx6z9rficy2s8k2b3xx8fsch932a4s"; + revision = "3"; + editedCabalFile = "05ymnx9vzba6jqkx2jil2qj15399qz9dxzqsy6gfpx1j65spjrva"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -298355,8 +301935,8 @@ self: { }: mkDerivation { pname = "svgone"; - version = "0.2.0.1"; - sha256 = "0gfi744l0060gs0cdgy7mfd9j6axivkjqbb9ayqa81v7mqrj9nzf"; + version = "0.2.0.2"; + sha256 = "0ifwsarp8kzr87lr9fivh6c3bc3ijvhb5h5ps9b7sgpc0qh57pk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -298769,6 +302349,33 @@ self: { mainProgram = "Swish"; }) {}; + "swish_0_10_10_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.10.0"; + sha256 = "1ssw4qg0dcxz9bas30g1z98sgfq3x92kbslm640vn01frga48m9c"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "Swish"; + }) {}; + "swiss" = callPackage ({ mkDerivation, base, bytestring, parallel, time }: mkDerivation { @@ -298961,7 +302568,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_18_0_0" = callPackage + "sydtest_0_19_0_0" = callPackage ({ mkDerivation, async, autodocodec, base, bytestring, containers , deepseq, dlist, fast-myers-diff, filepath, MonadRandom, mtl , opt-env-conf, path, path-io, pretty-show, QuickCheck @@ -298970,8 +302577,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.18.0.0"; - sha256 = "1krm952vqp79gw761d5f90jq30f6n9vih64ay73xacv5nzms5x5l"; + version = "0.19.0.0"; + sha256 = "12wp36pi2w7f3wffrmss8ra5y3xcpar4i9zp04z5r1g11y9i2h80"; libraryHaskellDepends = [ async autodocodec base bytestring containers deepseq dlist fast-myers-diff filepath MonadRandom mtl opt-env-conf path path-io @@ -299174,15 +302781,15 @@ self: { broken = true; }) {}; - "sydtest-mongo_0_1_0_0" = callPackage + "sydtest-mongo_0_2_0_0" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-process , text, yaml }: mkDerivation { pname = "sydtest-mongo"; - version = "0.1.0.0"; - sha256 = "1wqhqyg513mh8vxc2ddsxd04iywlz3gwgx35zawgldi215zdfnqi"; + version = "0.2.0.0"; + sha256 = "0sca6m2k03dss7qvfhm0km4x7karg9dck61qhv3gjr42i9145hib"; libraryHaskellDepends = [ base binary bson bytestring mongoDB network path path-io port-utils process sydtest sydtest-process text yaml @@ -300739,8 +304346,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.4"; - sha256 = "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l"; + version = "0.3.16.5"; + sha256 = "0a5hsdlzjjhfq7zvhg0fdlzviq6w8jj4jvkmk4wl1s07liwdqqw9"; libraryHaskellDepends = [ base bytestring system-filepath text time unix ]; @@ -300752,17 +304359,34 @@ self: { license = lib.licenses.mit; }) {}; + "system-fileio_0_3_16_6" = callPackage + ({ mkDerivation, base, bytestring, chell, system-filepath + , temporary, text, time, transformers, unix + }: + mkDerivation { + pname = "system-fileio"; + version = "0.3.16.6"; + sha256 = "0qmsvs5jpg6y82cqh0g37f7dz8172ikgiwcpgs72zwxq35xk271a"; + libraryHaskellDepends = [ + base bytestring system-filepath text time unix + ]; + testHaskellDepends = [ + base bytestring chell system-filepath temporary text time + transformers unix + ]; + description = "Consistent filesystem interaction across GHC versions (deprecated)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "system-filepath" = callPackage - ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck - , deepseq, QuickCheck, text + ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq + , QuickCheck, text }: mkDerivation { pname = "system-filepath"; - version = "0.4.14"; - sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; - revision = "2"; - editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.14.1"; + sha256 = "19fs8g1p07ckb0ydak4fczz58ngy3aywkliv1hbcvlc5w512j8ig"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -301092,8 +304716,8 @@ self: { }: mkDerivation { pname = "systranything"; - version = "0.1.0.0"; - sha256 = "1p6y9hvkn12n1dwnkwij2qjjdvhzqwq9sxqmlzrkclbmkmivcanj"; + version = "0.1.2.0"; + sha256 = "1da3zqkknx9yg8spwjpaxx4sizwl598p2dwr2nnrl6dw033c6m1f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -301526,6 +305150,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "tagged_0_8_9" = callPackage + ({ mkDerivation, base, deepseq, template-haskell, transformers }: + mkDerivation { + pname = "tagged"; + version = "0.8.9"; + sha256 = "1137jm5zbnirv7padqqhc0ky8l3npqn8v2fjasjscjs1pf7diakd"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tagged-binary" = callPackage ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }: mkDerivation { @@ -301634,6 +305272,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tagged-transformer_0_8_3" = callPackage + ({ mkDerivation, base, comonad, contravariant, distributive + , exceptions, mtl, reflection, semigroupoids, tagged + }: + mkDerivation { + pname = "tagged-transformer"; + version = "0.8.3"; + sha256 = "1d8amfva6pvkb9d7pkbppdxl0fp2pvsj4gdrblarr0ckx6xigjl1"; + libraryHaskellDepends = [ + base comonad contravariant distributive exceptions mtl reflection + semigroupoids tagged + ]; + description = "Monad transformer carrying an extra phantom type tag"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tagging" = callPackage ({ mkDerivation, base, bytestring, pcre-light }: mkDerivation { @@ -302334,6 +305989,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "talash"; + broken = true; }) {}; "tamarin-prover" = callPackage @@ -302892,16 +306548,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "tasty_1_5" = callPackage + "tasty_1_5_2" = callPackage ({ mkDerivation, ansi-terminal, base, containers , optparse-applicative, stm, tagged, transformers, unix }: mkDerivation { pname = "tasty"; - version = "1.5"; - sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; - revision = "2"; - editedCabalFile = "0jr6a6klg08x9pqmap3h3ys5dhda0w92ysbnsvvi81vrzxzz98wd"; + version = "1.5.2"; + sha256 = "0dxp65vm2nfal7nhiznm26yrcq5xj6qkpzjixf2j5gmr9x2v173j"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -302980,6 +306634,35 @@ self: { mainProgram = "tasty-autocollect"; }) {}; + "tasty-autocollect_0_4_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , explainable-predicates, filepath, ghc, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, transformers + , typed-process + }: + mkDerivation { + pname = "tasty-autocollect"; + version = "0.4.4"; + sha256 = "0bkih5566dai863sbig697wn6s6zxy7kgq9igdj7vyl3axq4wqkz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath ghc tasty + tasty-expected-failure template-haskell text transformers + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring containers directory explainable-predicates + filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary + text typed-process + ]; + description = "Autocollection of tasty tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tasty-autocollect"; + }) {}; + "tasty-bdd" = callPackage ({ mkDerivation, aeson, aeson-qq, base, exceptions, free, HUnit , microlens, microlens-th, mtl, pretty, pretty-show @@ -303026,6 +306709,8 @@ self: { pname = "tasty-bench"; version = "0.4"; sha256 = "1qkvdp1djbvb2b7yxckpfaygdgsh71h340mbvprm0r6dim3q1742"; + revision = "1"; + editedCabalFile = "1qqz7jr0pgfg6sxgcddfgnxk8xwlf1ymllwf64bg2ddfjkm3dqq6"; libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; @@ -303191,10 +306876,8 @@ self: { ({ mkDerivation, base, retry, tagged, tasty, tasty-hunit }: mkDerivation { pname = "tasty-flaky"; - version = "0.1.0.0"; - sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; - revision = "1"; - editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; + version = "0.1.1.0"; + sha256 = "0i7ajmpiywa1k1kbdvnwkgna9majxmq7s07asrvlbgy22mkyq2py"; libraryHaskellDepends = [ base retry tagged tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Handle flaky Tasty-based tests"; @@ -303241,6 +306924,27 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-golden-extra" = callPackage + ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base, bytestring + , pretty-show, pretty-simple, tasty, tasty-discover, tasty-golden + , text, yaml + }: + mkDerivation { + pname = "tasty-golden-extra"; + version = "0.1.0.0"; + sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj"; + revision = "1"; + editedCabalFile = "0y2a1vcyl1i4dga07ahpm52f2z3dlp52rq4m1hh706s8g2hpf8gz"; + libraryHaskellDepends = [ + aeson aeson-diff aeson-pretty base bytestring pretty-show + pretty-simple tasty tasty-discover tasty-golden text yaml + ]; + description = "Additional golden test helpers for the tasty-golden package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tasty-grading-system" = callPackage ({ mkDerivation, aeson, base, containers, directory, filepath , generic-deriving, mtl, stm, tagged, tasty, text @@ -303286,8 +306990,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "5"; - editedCabalFile = "19csv89pdva2d5fa0f9kwiq9cdcr51gsnaay62icjpkjw9anapch"; + revision = "6"; + editedCabalFile = "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -303444,6 +307148,8 @@ self: { pname = "tasty-inspection-testing"; version = "0.2.1"; sha256 = "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"; + revision = "1"; + editedCabalFile = "1gv2irfyh7bv1ib8palq6g4chh9wfa93k56f14650isxi9ma6wj4"; libraryHaskellDepends = [ base ghc inspection-testing tasty template-haskell ]; @@ -303762,8 +307468,8 @@ self: { pname = "tasty-rerun"; version = "1.1.19"; sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; - revision = "3"; - editedCabalFile = "0s83ylr3wj2whzia7s4yb0cihbpz762nfdmg2kwr3nalpd8j1lzk"; + revision = "4"; + editedCabalFile = "1y6qmwdwwdqmjlybjjmrh22s8856kcfnl2gaq1v2z8wzn6jcfr2l"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -304656,24 +308362,19 @@ self: { }) {}; "telegram-bot-api" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron - , filepath, hashable, http-api-data, http-client, http-client-tls - , monad-control, mtl, pretty-show, profunctors, servant - , servant-client, servant-multipart-api, servant-multipart-client - , servant-server, split, stm, template-haskell, text, time - , transformers, unordered-containers, warp, warp-tls + ({ mkDerivation, aeson, base, filepath, hashable, http-api-data + , http-client, http-client-tls, mtl, servant, servant-client + , servant-multipart-api, servant-multipart-client, servant-server + , template-haskell, text, time }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4.1"; - sha256 = "1ppjyq278ri2467vcyb1z01jsqbirls8lazi1lr8pk9z0sw8mz5y"; + version = "7.4.4"; + sha256 = "1viyh5vkis6gydp7n1vrn3x17hjw3q872z6as54y7kfm9r07kp4h"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring cron filepath hashable - http-api-data http-client http-client-tls monad-control mtl - pretty-show profunctors servant servant-client - servant-multipart-api servant-multipart-client servant-server split - stm template-haskell text time transformers unordered-containers - warp warp-tls + aeson base filepath hashable http-api-data http-client + http-client-tls mtl servant servant-client servant-multipart-api + servant-multipart-client servant-server template-haskell text time ]; description = "Easy to use library for building Telegram bots. Exports Telegram Bot API."; license = lib.licenses.bsd3; @@ -304689,10 +308390,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.3"; - sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; - revision = "1"; - editedCabalFile = "0warsrhsk3vqg9hyr5ircm01shls4n201z7nmjigli1nzzidljf8"; + version = "0.14.4"; + sha256 = "1pcwn8ykq244yl3sy6ip4jhy2i98j2d01av2h0x348abxmqbh3gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -304802,6 +308501,32 @@ self: { broken = true; }) {}; + "telescope" = callPackage + ({ mkDerivation, base, binary, byte-order, bytestring, casing + , conduit, containers, effectful, exceptions, fits-parse, libyaml + , massiv, megaparsec, resourcet-effectful, scientific, skeletest + , text, time + }: + mkDerivation { + pname = "telescope"; + version = "0.2.0"; + sha256 = "0ax9sk5910zi09wnyxc9zn4sf54bsvyycsj8faxrgf840wpw990f"; + libraryHaskellDepends = [ + base binary byte-order bytestring casing conduit effectful + exceptions fits-parse libyaml massiv megaparsec resourcet-effectful + scientific text time + ]; + testHaskellDepends = [ + base binary byte-order bytestring casing conduit containers + effectful exceptions fits-parse libyaml massiv megaparsec + resourcet-effectful scientific skeletest text time + ]; + testToolDepends = [ skeletest ]; + description = "Astronomical Observations (FITS, ASDF, WCS, etc)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "teleshell" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hashable, network , pipes, primitive, QuickCheck, split, tasty, tasty-hunit @@ -304935,13 +308660,13 @@ self: { broken = true; }) {}; - "template-haskell_2_22_0_0" = callPackage - ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: + "template-haskell_2_23_0_0" = callPackage + ({ mkDerivation, base, ghc-boot-th }: mkDerivation { pname = "template-haskell"; - version = "2.22.0.0"; - sha256 = "0cn9n5jyzn9h1ab76rr2cyxaysh2rk7ywcj92lxsf49fah4vx35g"; - libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; + version = "2.23.0.0"; + sha256 = "1nflc99kixhgj8h05lvlin8dpxbxngs8j436qxgqaqzx3ijncbdf"; + libraryHaskellDepends = [ base ghc-boot-th ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -306726,8 +310451,8 @@ self: { pname = "testcontainers"; version = "0.5.0.0"; sha256 = "06n02inh5ihbbpmlf7fjvq8idk4lrr8wsjbwarklh229azq99h7n"; - revision = "1"; - editedCabalFile = "19lxdf3hyhraf7ykx3cdv70j8rc9jx1ynfkjqpczm4pmp72pw06p"; + revision = "2"; + editedCabalFile = "0r4f5h7kpp83inva3ki0qgwhgralk35bdka3xwfmnymf3l7ix8sn"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring directory exceptions http-client http-types mtl network optics-core process random @@ -306739,8 +310464,6 @@ self: { testToolDepends = [ hspec-discover tasty-discover ]; description = "Docker containers for your integration tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "testing-feat" = callPackage @@ -306941,15 +310664,15 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "texmath_0_12_8_11" = callPackage + "texmath_0_12_8_12" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty , tasty-golden, text, typst-symbols, xml }: mkDerivation { pname = "texmath"; - version = "0.12.8.11"; - sha256 = "0yyxr5bdl1shsp3ir9d9a2hwah3cz6p3pvak27k4fvk1idisds7z"; + version = "0.12.8.12"; + sha256 = "10q5kl82hdaqnryw4wd0218ydym71hqmg0rbpgf3i92ilqm5a18f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307017,7 +310740,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "text_2_1_1" = callPackage + "text_2_1_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, QuickCheck , system-cxx-std-lib, tasty, tasty-bench, tasty-hunit @@ -307026,16 +310749,16 @@ self: { }: mkDerivation { pname = "text"; - version = "2.1.1"; - sha256 = "1azy4kzy23nhck4mxfrqdd754z8nbwpxqdgdfqjdgx45nalds374"; + version = "2.1.2"; + sha256 = "1dmcrvgavan5r5h4w0rjcmjii3l1rglr03wi4nd8xlw7jbshr9l4"; revision = "1"; - editedCabalFile = "0zg8nlri1lhhyhzwl38xsil23j4xgc47ycjk0jl0f1jx0n8zphvq"; + editedCabalFile = "0m57vdin9bkn9fbdlhhc9dl625asy39rv7vfzhg92q9sd50d5618"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim system-cxx-std-lib template-haskell ]; testHaskellDepends = [ - base bytestring deepseq directory ghc-prim QuickCheck tasty + base binary bytestring deepseq directory ghc-prim QuickCheck tasty tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell transformers ]; @@ -307151,8 +310874,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.5"; - sha256 = "1mg503a73jl5bpjp7npqadq1lj0sfc1krpqw1s4zybfn70n49vah"; + version = "0.3.6"; + sha256 = "0i49ki86i22w8pab46ljxw3br0l2d7wvilf9mxh9zhi6a2a4sarb"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class QuickCheck quickcheck-instances split text time transformers @@ -307166,6 +310889,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_9" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, lawful-conversions, QuickCheck + , quickcheck-classes, quickcheck-instances, rerebase, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.9"; + sha256 = "07jfgw3b797awbaw4a6dpnlkfqfkk983ja4sc5dmfwsnajyiy1wh"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class lawful-conversions + QuickCheck quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat lawful-conversions quickcheck-classes + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, ghc-bignum, quote-quot, tasty , tasty-bench, tasty-quickcheck, text @@ -307615,6 +311362,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "text-misc-yj" = callPackage + ({ mkDerivation, base, mtl-misc-yj, text }: + mkDerivation { + pname = "text-misc-yj"; + version = "0.1.0.2"; + sha256 = "02wnzkp9g2wdmpp5pwpyl56fm69ahv7miy8374j7pl6sp4i7g18i"; + libraryHaskellDepends = [ base mtl-misc-yj text ]; + testHaskellDepends = [ base mtl-misc-yj text ]; + description = "tribial tools about text"; + license = lib.licenses.bsd3; + }) {}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -307856,8 +311615,8 @@ self: { pname = "text-short"; version = "0.1.6"; sha256 = "1avfamw6sig6r5zpm2hbas373qbrdszi4q33gds9ihvxil9ylww1"; - revision = "2"; - editedCabalFile = "1r0bjj1h05bqf2g6plcq5sz5rzvq4s99xj1dmgnlfq0vqwadqlsr"; + revision = "3"; + editedCabalFile = "0fhnd5dd46pjja8rpawq8ld93ix31q9wa18bkfv6lr7nsg699gj1"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -307944,10 +311703,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.8"; - sha256 = "13h2nfbmqzll9glifi7n9dkmaxks72w8ciwzwk106iygzpbrnw3c"; - revision = "1"; - editedCabalFile = "17nzy1wr318m90bdmj37rrzwsfhri28azgaqrvpl5igllc4d0480"; + version = "3.9.10"; + sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc nonempty-vector old-locale old-time @@ -307969,42 +311726,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show-instances_3_9_9" = callPackage - ({ mkDerivation, aeson, base, base-compat, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, nonempty-vector - , old-locale, old-time, pretty, QuickCheck, quickcheck-instances - , random, scientific, semigroups, tagged, template-haskell - , terminfo, text, text-short, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , uuid-types, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.9.9"; - sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc nonempty-vector old-locale old-time - pretty random scientific semigroups tagged template-haskell - terminfo text text-short text-show time transformers unix - unordered-containers uuid-types vector xhtml - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - nonempty-vector old-locale old-time pretty QuickCheck - quickcheck-instances random scientific tagged template-haskell - terminfo text-short text-show th-orphans time transformers - transformers-compat unix unordered-containers uuid-types vector - xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308371,12 +312092,12 @@ self: { license = lib.licenses.isc; }) {}; - "th-abstraction_0_7_0_0" = callPackage + "th-abstraction_0_7_1_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.7.0.0"; - sha256 = "0897na3f8nj59ax1gv0a46rrrz8i4ad0id6b3vxav91g5xhlr1dj"; + version = "0.7.1.0"; + sha256 = "1i843j7lhq6qly9zknrw3nhb17ac3badmxwn1pfn2sscp951idpr"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -308461,6 +312182,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-compat_0_1_6" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell + }: + mkDerivation { + pname = "th-compat"; + version = "0.1.6"; + sha256 = "1sx4l374vjw3clc7a3vk8kkq37kxzbv9h3nh0racjaw7b70a10dp"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec mtl template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Backward- (and forward-)compatible Quote and Code types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-constraint-compat" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -308516,8 +312252,8 @@ self: { pname = "th-deepstrict"; version = "0.1.1.0"; sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; - revision = "1"; - editedCabalFile = "0fip82wksknywr9wqmwsyf7847j5abhsqpbhbv8l9hlfhz6889d9"; + revision = "2"; + editedCabalFile = "1h4shx5kcyj3k0bngr2fbngl2l4dcyk8qffvbfm2qjlp4ymz6m0n"; libraryHaskellDepends = [ base containers mtl template-haskell th-abstraction th-orphans ]; @@ -308578,18 +312314,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "th-desugar_1_17" = callPackage + "th-desugar_1_18" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction - , th-orphans, transformers-compat + , th-compat, th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.17"; - sha256 = "0a00l9r7qyhl30bizrydcsjcraia2vq3r4jc7papab4mdv59z1wz"; + version = "1.18"; + sha256 = "0nq64z9nb2jbvs6pvnbafz33pymbgil2r783sl6fx2yjblqw3l3h"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb - template-haskell th-abstraction th-orphans transformers-compat + template-haskell th-abstraction th-compat th-orphans + transformers-compat ]; testHaskellDepends = [ base containers ghc-prim hspec HUnit mtl syb template-haskell @@ -308645,6 +312382,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_12_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.12.0"; + sha256 = "03zgqq0bwcjmy4d3m00gqzh4r1big2yh9v69rxvg72cw69krkq8q"; + libraryHaskellDepends = [ + base containers syb template-haskell th-abstraction + ]; + testHaskellDepends = [ base template-haskell th-abstraction ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, containers, syb, template-haskell , th-abstraction @@ -308827,10 +312581,8 @@ self: { }: mkDerivation { pname = "th-lift"; - version = "0.8.4"; - sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "3"; - editedCabalFile = "053glydkbz2h03s4l0isbabp4w4w4b8k3xfd61awf5vdnnyrq612"; + version = "0.8.5"; + sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308839,13 +312591,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-lift_0_8_5" = callPackage + "th-lift_0_8_6" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { pname = "th-lift"; - version = "0.8.5"; - sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; + version = "0.8.6"; + sha256 = "07zgl42fq7ijmm29x7q10iv02hk6lqs7snysxdad03pq1vbrlc04"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308893,10 +312645,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.14"; - sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "4"; - editedCabalFile = "10fq55a34h1cysgigf1s2vlb0ka9s7d0lklpk63zla53fx7jshrl"; + version = "0.13.15"; + sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -308908,14 +312658,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-orphans_0_13_15" = callPackage + "th-orphans_0_13_16" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-compat, th-lift, th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.13.15"; - sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; + version = "0.13.16"; + sha256 = "04x95fwsiczbi4gxadnnz6z39hy72hsj1smfaa52ljhwh8sh3479"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -309050,6 +312800,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-test-utils_1_2_2" = callPackage + ({ mkDerivation, base, tasty, tasty-golden, tasty-hunit + , template-haskell, text, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.2.2"; + sha256 = "1ihngf4g4q1c3hvzjax5ar437xm0h2yxiwnr518jm4mnsfkx3sss"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base tasty tasty-golden tasty-hunit template-haskell text + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -309659,8 +313429,8 @@ self: { pname = "threadscope"; version = "0.2.14.1"; sha256 = "0hfn90299mp18p2bjj2bgfi1pk3ndxz4nv2ac6z52kvh00sr9drq"; - revision = "1"; - editedCabalFile = "11qpwvsic884nx2v2g2fw7i6n9905rjpj6lp150insh6cs88kqfc"; + revision = "3"; + editedCabalFile = "1vrn7ccxh2r9sfg6qpvpd5rva442d1lhk3k3bs5d7cqj4dcpcg6x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -309983,6 +313753,36 @@ self: { broken = true; }) {}; + "thyme_0_4_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , cpphs, criterion, deepseq, hashable, mtl, old-locale, profunctors + , QuickCheck, random, template-haskell, text, time, vector + , vector-space, vector-th-unbox + }: + mkDerivation { + pname = "thyme"; + version = "0.4.1"; + sha256 = "1i3nrm516vcsnkqbd1fhv922xz66063fiv6lbw9y66wkqm9nds89"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq hashable mtl + old-locale profunctors QuickCheck random template-haskell text time + vector vector-space vector-th-unbox + ]; + libraryToolDepends = [ cpphs ]; + testHaskellDepends = [ + attoparsec base bytestring containers mtl old-locale profunctors + QuickCheck random text time vector-space + ]; + benchmarkHaskellDepends = [ + base criterion mtl old-locale profunctors QuickCheck random time + vector vector-space + ]; + description = "A faster time library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tianbar" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, dbus, directory, filepath, gi-gdk, gi-gio, gi-glib @@ -310646,13 +314446,13 @@ self: { license = lib.licenses.mit; }) {}; - "time-manager_0_1_0" = callPackage - ({ mkDerivation, auto-update, base, unliftio }: + "time-manager_0_2_2" = callPackage + ({ mkDerivation, auto-update, base, containers, stm }: mkDerivation { pname = "time-manager"; - version = "0.1.0"; - sha256 = "1r2wgi160nkky220bdwknld1ymfpq4541pzbhmkna670r1ahzcb2"; - libraryHaskellDepends = [ auto-update base unliftio ]; + version = "0.2.2"; + sha256 = "1sm9rm2r45r535xc85xkzla6ym8rd84hs5aygpi1dr67z53d01fn"; + libraryHaskellDepends = [ auto-update base containers stm ]; description = "Scalable timer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -311529,15 +315329,17 @@ self: { }) {}; "tinyapp" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, brick, mtl, vty }: mkDerivation { pname = "tinyapp"; - version = "0.1.0.2"; - sha256 = "1xsh0fv5zmcpgcm5xq3xap5fx9y1v8z14pdqa9xsy7v509g4c8l1"; - libraryHaskellDepends = [ base ]; + version = "0.2.1.0"; + sha256 = "1rbr41wwyi2y8ybzz0fn8bbsqc5gnnvj5nchr6d2gjxylsn8c61d"; + libraryHaskellDepends = [ base brick mtl vty ]; testHaskellDepends = [ base ]; description = "Library to build tiny apps in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tinyfiledialogs" = callPackage @@ -312052,6 +315854,8 @@ self: { pname = "tls"; version = "2.0.6"; sha256 = "07cznhk0jf2ffkpmq3q9iz9r4zcls8rkh32s3qqwaahp8lnvmsm3"; + revision = "1"; + editedCabalFile = "1qklaagllqncdfa31k35iaasaxsq1378cpp8p5hg8h920rrv4z9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312071,29 +315875,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_1" = callPackage + "tls_2_1_5" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 - , crypton-x509-store, crypton-x509-validation, data-default-class + , crypton-x509-store, crypton-x509-validation, data-default , hourglass, hspec, hspec-discover, memory, mtl, network , QuickCheck, serialise, transformers, unix-time }: mkDerivation { pname = "tls"; - version = "2.1.1"; - sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; + version = "2.1.5"; + sha256 = "008q5381wgymavl0svf02sv1vprkz7v8zr0cnglqla6823z7dnx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - asn1-encoding asn1-types async base base16-bytestring bytestring - cereal crypton crypton-x509 crypton-x509-store - crypton-x509-validation data-default-class memory mtl network - serialise transformers unix-time + asn1-encoding asn1-types base base16-bytestring bytestring cereal + crypton crypton-x509 crypton-x509-store crypton-x509-validation + data-default memory mtl network serialise transformers unix-time ]; testHaskellDepends = [ asn1-types async base bytestring crypton crypton-x509 - crypton-x509-validation data-default-class hourglass hspec - QuickCheck serialise + crypton-x509-validation data-default hourglass hspec QuickCheck + serialise ]; testToolDepends = [ hspec-discover ]; description = "TLS protocol native implementation"; @@ -312159,14 +315962,16 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls-session-manager_0_0_6" = callPackage + "tls-session-manager_0_0_7" = callPackage ({ mkDerivation, auto-update, base, basement, bytestring, clock , crypto-token, memory, psqueues, serialise, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.6"; - sha256 = "019b8d54nmmrqxf6nw4si0cym7hjmd2safq848hzihimgjp41caz"; + version = "0.0.7"; + sha256 = "0n88cnwcaz86izp0x004pbjm2nnr1x6lc75kjc26j9m4k9h266nc"; + revision = "1"; + editedCabalFile = "16ipngf44pbzf9xdvh6khkjrjz860nd48f5lrzbi5dnbjhcd6vi2"; libraryHaskellDepends = [ auto-update base basement bytestring clock crypto-token memory psqueues serialise tls @@ -312201,6 +316006,31 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "tlynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , comonad, containers, data-default, elynx-tools, elynx-tree + , gnuplot, optparse-applicative, parallel, random, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.8.0.0"; + sha256 = "144jr0wiww76x4k053bshs88cicpnqyz43ya6m8kmg77m5n6fpvy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring comonad containers + data-default elynx-tools elynx-tree gnuplot optparse-applicative + parallel random statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "tlynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -312299,7 +316129,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_7_1_0" = callPackage + "tmp-proc_0_7_2_1" = callPackage ({ mkDerivation, async, base, bytestring, crypton-connection , crypton-x509-system, data-default, directory, filepath, fmt , hspec, http-client, http-client-tls, http-types, mtl, mustache @@ -312308,8 +316138,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.1.0"; - sha256 = "0l7grkyl0n1h6nbhfi8ivn3wxdkjzhhwfnbxrlbvf2pbiidgj6bc"; + version = "0.7.2.1"; + sha256 = "072jwd36dp9a7sy4kzibc30jcfgib8qvfkw5fn57azkb7awkg6aq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -312408,14 +316238,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc-rabbitmq_0_7_0_1" = callPackage + "tmp-proc-rabbitmq_0_7_2_0" = callPackage ({ mkDerivation, amqp, base, bytestring, hspec, hspec-tmp-proc , text, tmp-proc }: mkDerivation { pname = "tmp-proc-rabbitmq"; - version = "0.7.0.1"; - sha256 = "1jxymiffs8822rxh4fcpiblnd9k40s53p7sx3ny1nf9a3qvh82nf"; + version = "0.7.2.0"; + sha256 = "1m6mdvsv0gd0qqrqikwl2bqz61i14w3zay7z2547vzsbdxb3mfkk"; libraryHaskellDepends = [ amqp base bytestring text tmp-proc ]; testHaskellDepends = [ amqp base bytestring hspec hspec-tmp-proc text tmp-proc @@ -312992,6 +316822,8 @@ self: { pname = "toml-parser"; version = "2.0.1.0"; sha256 = "1qcpcrcalds3a2gdx83iynpj3hvkg6hbyza8al0f7jdsg9r6sdh3"; + revision = "1"; + editedCabalFile = "1m3i2zbaavcyikp6dqqvyrvc1706zzsaqzg5z1bix916gscfkdhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -313080,6 +316912,8 @@ self: { pname = "tomland"; version = "1.3.3.3"; sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; + revision = "2"; + editedCabalFile = "070x95r3silsswl74b5jpsy3s8644mcjqihq3b334jlvvqql5ypw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -313375,6 +317209,24 @@ self: { broken = true; }) {}; + "tools-yj" = callPackage + ({ mkDerivation, base, containers, data-default, mono-traversable + , stm, text + }: + mkDerivation { + pname = "tools-yj"; + version = "0.1.0.20"; + sha256 = "0kazb0gzr21hdiqv3avlw5c2i3ikf0pzy6ybsi7qhj2hxv1kz9zi"; + libraryHaskellDepends = [ + base containers data-default mono-traversable stm text + ]; + testHaskellDepends = [ + base containers data-default mono-traversable stm text + ]; + description = "Tribial tools"; + license = lib.licenses.bsd3; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -313652,25 +317504,28 @@ self: { }) {}; "toxcore-c" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring - , bytestring-arbitrary, data-default-class, directory, hspec - , QuickCheck, saltine, toxcore + ({ mkDerivation, base, base16-bytestring, bytestring, cryptohash + , directory, generic-arbitrary, hspec, msgpack-binary, QuickCheck + , quickcheck-instances, saltine, text, toxcore, vector }: mkDerivation { pname = "toxcore-c"; - version = "0.2.11"; - sha256 = "1fgz30y867lw9d6pmssi75k1prlfgrlpfa9qzqkm52mra2r5d2mb"; + version = "0.2.19"; + sha256 = "0pcs7ikmc6pdamhj5yg9sa4lizs177vjp2ayjf51jrhsd4zinrfd"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring data-default-class ]; + libraryHaskellDepends = [ + base bytestring generic-arbitrary msgpack-binary QuickCheck + quickcheck-instances + ]; librarySystemDepends = [ toxcore ]; executableHaskellDepends = [ - base base16-bytestring bytestring directory + base base16-bytestring bytestring directory text ]; executableSystemDepends = [ toxcore ]; testHaskellDepends = [ - base base16-bytestring bytestring bytestring-arbitrary - data-default-class hspec QuickCheck saltine + base base16-bytestring bytestring cryptohash hspec msgpack-binary + QuickCheck saltine vector ]; description = "Haskell bindings to the C reference implementation of Tox"; license = lib.licenses.gpl3Only; @@ -314991,7 +318846,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_2" = callPackage + "tree-diff_0_3_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -315001,8 +318856,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.2"; - sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; + version = "0.3.3"; + sha256 = "1wmcwwhpxprmfi4d0rn4wykx79nh34p4sqkyvrsx0vn38m9g8i3y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -315484,8 +319339,8 @@ self: { pname = "trial"; version = "0.0.0.0"; sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; - revision = "4"; - editedCabalFile = "08sdqn830rfpsd5czm11899lgzs2bvyiq8zhkqaaj10by4ms5vza"; + revision = "5"; + editedCabalFile = "1bsgash3gjvqybfl0n77gw5l1xhidjpm253n4v5dfk7qls6nplm1"; libraryHaskellDepends = [ base colourista dlist ]; testHaskellDepends = [ base dlist doctest hedgehog hspec hspec-hedgehog splitmix @@ -315500,8 +319355,8 @@ self: { pname = "trial-optparse-applicative"; version = "0.0.0.0"; sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; - revision = "3"; - editedCabalFile = "01kcmcizi6jahxxj2kcmwgkg59fwihbqxnxqa8x64fqs6vqpd8rw"; + revision = "4"; + editedCabalFile = "05rzzcsqvhil7wbsz23syd35h9jqbmmabx89v3h86ng7my3w1nc1"; libraryHaskellDepends = [ base optparse-applicative trial ]; description = "Trial helper functions for optparse-applicative"; license = lib.licenses.mpl20; @@ -315513,8 +319368,8 @@ self: { pname = "trial-tomland"; version = "0.0.0.0"; sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; - revision = "4"; - editedCabalFile = "1zbp0njb82gmslaki2wb7vm1q33sxdv6ac8f2xjlbj1x03a2phsx"; + revision = "5"; + editedCabalFile = "1x43dsjqzs1sqfqljwjd96p3p0gcy8gzbafbvvsyi8vrbj6vphpv"; libraryHaskellDepends = [ base text tomland trial ]; description = "Trial helper functions for tomland"; license = lib.licenses.mpl20; @@ -315560,6 +319415,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "trie-simple_0_4_3" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, hspec + , hspec-discover, indexed-traversable, matchable, mtl, mwc-random + , QuickCheck, semialign, tasty-bench, these, vector, witherable + }: + mkDerivation { + pname = "trie-simple"; + version = "0.4.3"; + sha256 = "1hbcwp1aahmnqxyzv6c2l3k1ifnzssjz66mw1gp2a63z12z4gwyg"; + libraryHaskellDepends = [ + base containers deepseq hashable indexed-traversable matchable mtl + semialign these witherable + ]; + testHaskellDepends = [ base containers hspec QuickCheck vector ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base containers deepseq mwc-random tasty-bench vector + ]; + description = "Simple Map-based Trie"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tries" = callPackage ({ mkDerivation, base, bytestring, composition, containers , criterion, deepseq, hashable, keys, mtl, QuickCheck @@ -315803,8 +319681,6 @@ self: { testHaskellDepends = [ base containers template-haskell time ]; description = "Template Haskell hack to violate module abstractions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "truelevel" = callPackage @@ -316730,8 +320606,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.2.0.0"; - sha256 = "1d69hc5nxc6pxbwbf13ch9yfmf9zphznv1w9hmszbndjwpc767nj"; + version = "2.2.0.1"; + sha256 = "1ypx89sz9gswn3696y13l6yzvn6wf8rq8ybfcl51ls7773cdkqf3"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -318456,6 +322332,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "typecheck-plugin-nat-simple_0_1_0_11" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-internal + , ghc-tcplugins-extra + }: + mkDerivation { + pname = "typecheck-plugin-nat-simple"; + version = "0.1.0.11"; + sha256 = "0rb4cxib6i7byn7syym252gvrw7mgrfjglqwsiwprc7mx254k42i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers ghc ghc-internal ghc-tcplugins-extra + ]; + testHaskellDepends = [ + base containers ghc ghc-internal ghc-tcplugins-extra + ]; + description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-admin" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, data-default-class , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session @@ -318616,19 +322512,17 @@ self: { }) {}; "typed-process-effectful" = callPackage - ({ mkDerivation, base, bytestring, effectful, effectful-core, tasty - , tasty-hunit, typed-process + ({ mkDerivation, base, bytestring, effectful, tasty, tasty-hunit + , typed-process }: mkDerivation { pname = "typed-process-effectful"; - version = "1.0.0.2"; - sha256 = "172d04jbvwiy96ggminzlg63skh4gwnbzia90hb67si2zbh8slyd"; + version = "1.0.0.3"; + sha256 = "07vsi991x9aflbk5pza1y20y9pg3zpnqjdj9c7brwv75m9yjasw5"; libraryHaskellDepends = [ - base bytestring effectful effectful-core typed-process - ]; - testHaskellDepends = [ - base effectful effectful-core tasty tasty-hunit + base bytestring effectful typed-process ]; + testHaskellDepends = [ base effectful tasty tasty-hunit ]; description = "A binding of the typed-process library for the effectful effect system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -318929,6 +322823,20 @@ self: { broken = true; }) {}; + "typelevel-tools-yj" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "typelevel-tools-yj"; + version = "0.1.0.7"; + sha256 = "187if2gk1q31cnfrdih9zw7yij6cwkmfb32bsprz9jqvwvgfixak"; + revision = "1"; + editedCabalFile = "102zdd247wja46m159smpbnfmmqk4wd9dk0g5zsycrfsnxzvz28b"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "type level tools"; + license = lib.licenses.bsd3; + }) {}; + "typelits-printf" = callPackage ({ mkDerivation, base, hspec, text }: mkDerivation { @@ -319273,7 +323181,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "typst_0_6" = callPackage + "typst_0_6_1" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cassava , containers, directory, filepath, mtl, ordered-containers, parsec , pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden @@ -319281,8 +323189,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.6"; - sha256 = "092pdx7qkrvxb0gz316aylgayzlkc3scw8dj5jkf4riq8gc3h7x1"; + version = "0.6.1"; + sha256 = "1vcg5lvqxsxf5q1jg8c5g2fcmalfah92fqv6rzr8b5m1ipai2c10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -319368,8 +323276,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "7"; - editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; + revision = "8"; + editedCabalFile = "04icpw2qpsrfyh71rmnxavkk3xhlbrdgp7qxawcac2brx9g6bglz"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -320170,8 +324078,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Support for programming with names and binders using GHC Generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unbound-generics-unify" = callPackage @@ -320187,6 +324093,7 @@ self: { description = "Unification based on unbound-generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unbound-kind-generics" = callPackage @@ -320202,7 +324109,6 @@ self: { ]; description = "Support for programming with names and binders using kind-generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unbounded-delays" = callPackage @@ -320723,8 +324629,8 @@ self: { pname = "unicode-data"; version = "0.6.0"; sha256 = "0iwr096kwvjmx32a2drzz5hlam5sy0ca2m15ih33r8imhlb371xj"; - revision = "1"; - editedCabalFile = "0ijgkzh73x1fhjwr0zv9bg69s5ff95gdxv9acd4kpwa8nd9nvzsn"; + revision = "2"; + editedCabalFile = "1y592fjr7i0416nzxr8g91apm8ff9gls5lwr16bc7zsh9hdyahja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; @@ -320975,12 +324881,12 @@ self: { }) {}; "unification-fd" = callPackage - ({ mkDerivation, base, containers, logict, mtl }: + ({ mkDerivation, base, containers, data-fix, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.11.2.2"; - sha256 = "0jgy507dy1j566j46gndd8b2543n847myibg2i22yw8chdpl15kc"; - libraryHaskellDepends = [ base containers logict mtl ]; + version = "0.12.0.1"; + sha256 = "027v1mcwj0i2md5nrhdqfcad5hlj5a14wml0jzl596lqq1hz95qs"; + libraryHaskellDepends = [ base containers data-fix logict mtl ]; description = "Simple generic unification algorithms"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -321255,6 +325161,19 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "unimap" = callPackage + ({ mkDerivation, base, int-like, mtl, optics, prop-unit }: + mkDerivation { + pname = "unimap"; + version = "0.1.0"; + sha256 = "0akxl879q1jab3ammm2f9ykcl9sn0fvh2nzryfdp93pip107sbpi"; + libraryHaskellDepends = [ base int-like mtl optics ]; + testHaskellDepends = [ base int-like mtl optics prop-unit ]; + description = "A union-find/map data structure"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "union" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl @@ -321480,8 +325399,8 @@ self: { pname = "unique-logic-tf"; version = "0.5.1"; sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; - revision = "2"; - editedCabalFile = "1508h3mn28ks1g31l1hs4gf2fib4ihylb0wrzin52krs7kkbcnvn"; + revision = "3"; + editedCabalFile = "18ksx28w58g0mdnsk0sr57n76r48dbig4dk4cks3kjzhgbix4wd2"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -322128,14 +326047,16 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_5_1" = callPackage + "unix_2_8_6_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.5.1"; - sha256 = "0974ajqri7was72gnsgxa8zc4gq649zclaad1gw9pszjmr3c7djs"; + version = "2.8.6.0"; + sha256 = "18pf0nsqzj4ciwrwbynx7r47aapgbb4gn2kiar31vap4nfdmj5w1"; + revision = "1"; + editedCabalFile = "0ca08c8wsz4hfq7ajzaba45mxp9wak3x6vv37j63r747gbyqlzsv"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit tasty-quickcheck @@ -322300,8 +326221,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.15"; - sha256 = "0rkjjwbw4s1k13f0syy409yiqj7v9x8ghi209j3lxkh1xq9caq17"; + version = "0.4.16"; + sha256 = "1s9qws7z2z9d9ayljz98zdlsja3zvrbcb00n4arzwi3kdl9agqmc"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring hspec old-locale old-time QuickCheck @@ -322631,8 +326552,8 @@ self: { pname = "unordered-containers"; version = "0.2.20"; sha256 = "07gij1y9zhqg2dq8wy815j7s0zk2k65sqg4wvhwjsn80ry3v5kyr"; - revision = "3"; - editedCabalFile = "1g0sn6vn9p8cp9q5x5x7zf6qdf9y7gfpm76q29g91nay82x9rzn7"; + revision = "4"; + editedCabalFile = "08p4xp43mlqyl8ayh7k22p0q0kxlby9y071rpcr8jsf2lvfvqg13"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -324231,8 +328152,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.11.0"; - sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; + version = "0.0.14.0"; + sha256 = "0101dfb4f33l4qaa84s40lhlyfpmgsqb1v23j3x8kkf05md8bha8"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -324412,8 +328333,8 @@ self: { ({ mkDerivation, base, uu-tc-error-error }: mkDerivation { pname = "uu-tc-error"; - version = "0.3.0.0"; - sha256 = "0iaqpnlxlckf40asdj8y1b3sxixlc2sf9qkrpaqmfqqjy8gghcd5"; + version = "0.4.0.1"; + sha256 = "0857pjdpqgv645dhpq7s4wvr209jghb91vja4kiikqwyjcm3vjyl"; libraryHaskellDepends = [ base uu-tc-error-error ]; description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; license = lib.licenses.bsd3; @@ -324426,8 +328347,8 @@ self: { }: mkDerivation { pname = "uu-tc-error-error"; - version = "0.2.0.0"; - sha256 = "1hwpkl54s7qrz15as266izcgicp92afz0vnwbd67ichj7vvwv4q0"; + version = "0.3.0.0"; + sha256 = "1dsr5lpvzyn7vzdx4fh2gvm2345y3f2yzqv4drigg20fivrn762v"; libraryHaskellDepends = [ base bytestring containers deepseq mtl text ]; @@ -325124,8 +329045,8 @@ self: { pname = "validation-selective"; version = "0.2.0.0"; sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; - revision = "4"; - editedCabalFile = "01q9py4gs3hq1dbiny0irfpirdl1b08nydd56za1nfqf24d7z16c"; + revision = "5"; + editedCabalFile = "05lksfm5micvk2s6isscjf6ipkwd79698cczlr0ipgn8wmm87drz"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -325677,8 +329598,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "8"; - editedCabalFile = "0nabd5r1j6aq5ys3lsjh4i2ii9rza7923b5mg3vfbkj72w3dvgqv"; + revision = "9"; + editedCabalFile = "161akchka1ah1lhrzc0vm2f7ym0x2550scb4w2c0gl3y38n1c4jl"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -326104,6 +330025,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector_0_13_2_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, doctest, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-inspection-testing, tasty-quickcheck, template-haskell + , transformers, vector-stream + }: + mkDerivation { + pname = "vector"; + version = "0.13.2.0"; + sha256 = "08y4j6nii17wc3fs3d2za0yifd3gqf73g8zyqdnsry6bhv3h7wi8"; + libraryHaskellDepends = [ + base deepseq primitive random tasty vector-stream + ]; + testHaskellDepends = [ + base base-orphans doctest primitive QuickCheck random tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck + template-haskell transformers + ]; + benchmarkHaskellDepends = [ base random tasty tasty-bench ]; + doHaddock = false; + description = "Efficient Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bitvec, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -326125,6 +330071,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-algorithms_0_9_0_3" = callPackage + ({ mkDerivation, base, bitvec, bytestring, containers, mwc-random + , primitive, QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.9.0.3"; + sha256 = "17jd2kbz9frwcryp7zcjgwnh5vdajw9jmcqn17fq39f6ixwhp431"; + libraryHaskellDepends = [ + base bitvec bytestring primitive vector + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; + description = "Efficient algorithms for vector arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -326341,6 +330307,8 @@ self: { pname = "vector-fftw"; version = "0.1.4.0"; sha256 = "1ns5jhdx585s3jmcslscibf7ryaya3ca1shc4ysrikrp1mzx1jky"; + revision = "1"; + editedCabalFile = "0ncf80jfpm8g3rgdddfqxnhmdzj1qlvczzy24na129c282yp089m"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; testHaskellDepends = [ @@ -326448,26 +330416,24 @@ self: { }) {}; "vector-quicksort" = callPackage - ({ mkDerivation, atomic-counter, base, bytestring, containers - , deepseq, parallel, primitive, QuickCheck, random, stm - , system-cxx-std-lib, tasty, tasty-bench, tasty-quickcheck, text - , text-builder-linear, vector, vector-algorithms + ({ mkDerivation, base, bytestring, containers, deepseq, primitive + , QuickCheck, random, stm, system-cxx-std-lib, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, text, text-builder-linear, vector + , vector-algorithms }: mkDerivation { pname = "vector-quicksort"; - version = "0.1"; - sha256 = "1s8azyaa73zys31whi2m6l0mnyy8hdw8hzsdpd5h0j3d78ywykkf"; - revision = "1"; - editedCabalFile = "18h7lflrp2d80cjzdqwjykpl95b3ng9bcrb9gq5qnab652fgyr8j"; + version = "0.2"; + sha256 = "0cwydxijpm2s26q6g9h7mc5sm4pfqh5sagrvbvm6yiw264y810xb"; libraryHaskellDepends = [ - base parallel primitive stm system-cxx-std-lib vector + base primitive stm system-cxx-std-lib vector ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - atomic-counter base bytestring deepseq primitive random stm tasty - tasty-bench text text-builder-linear vector vector-algorithms + base bytestring deepseq random stm tasty tasty-bench tasty-hunit + text text-builder-linear vector vector-algorithms ]; doHaddock = false; description = "Fast and flexible quicksort implementation for mutable vectors"; @@ -326684,8 +330650,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "2"; - editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; + revision = "3"; + editedCabalFile = "07k5zgxbfbcf9anzfd9c0lzaa79iypdk303dq5yswi9a46andjas"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -326713,8 +330679,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "6"; - editedCabalFile = "1pdl1xvr1b4zg32b9d8jv4jakjnd5id5wdj2czgzajr6xlkvyhir"; + revision = "8"; + editedCabalFile = "1dzn47l5hqs541gjfq09r10rrqxw0wsj727kxkv334lw926npljh"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -328362,14 +332328,14 @@ self: { "vulkan" = callPackage ({ mkDerivation, base, bytestring, containers, inline-c, tasty , tasty-discover, tasty-hunit, template-haskell, transformers - , vector, vulkan + , vector, vulkan-loader }: mkDerivation { pname = "vulkan"; version = "3.26.2"; sha256 = "1y0yrcc2z43s98gyics9v56j0nkh6xk8knmqwslndsznzma6ga0c"; libraryHaskellDepends = [ base bytestring transformers vector ]; - libraryPkgconfigDepends = [ vulkan ]; + libraryPkgconfigDepends = [ vulkan-loader ]; testHaskellDepends = [ base containers inline-c tasty tasty-hunit template-haskell ]; @@ -328379,7 +332345,7 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - }) {vulkan = null;}; + }) {inherit (pkgs) vulkan-loader;}; "vulkan-api" = callPackage ({ mkDerivation, base }: @@ -328847,6 +332813,38 @@ self: { license = lib.licenses.mit; }) {}; + "wai-extra_3_1_17" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default, directory, fast-logger, hspec, hspec-discover + , http-types, HUnit, iproute, network, resourcet, streaming-commons + , temporary, text, time, transformers, unix, vault, wai, wai-logger + , warp, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.17"; + sha256 = "0jq1vr3sc4gbcan0w9mzvrj6p20m825zb1y4bq1yjccka146xmn7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default directory + fast-logger http-types HUnit iproute network resourcet + streaming-commons text time transformers unix vault wai wai-logger + warp word8 + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie directory fast-logger + hspec http-types HUnit iproute resourcet temporary text time wai + warp word8 zlib + ]; + testToolDepends = [ hspec-discover ]; + description = "Provides some basic WAI handlers and middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp @@ -329617,6 +333615,39 @@ self: { broken = true; }) {}; + "wai-middleware-delegate_0_2_0_0" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , bytestring-lexing, case-insensitive, conduit, conduit-extra + , crypton-connection, data-default, directory, filepath, hspec + , hspec-tmp-proc, http-client, http-client-tls, http-types + , mustache, network, random, resourcet, streaming-commons + , temporary, test-certs, text, tmp-proc, unix, vault, wai + , wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "wai-middleware-delegate"; + version = "0.2.0.0"; + sha256 = "1jcbyrvfq7r9nfw9zmazl9nlc5z6dgxdrmjlyiqm25c4bdkkzqaa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra http-client http-client-tls http-types + streaming-commons text wai wai-conduit + ]; + testHaskellDepends = [ + async base blaze-builder bytestring bytestring-lexing + case-insensitive conduit conduit-extra crypton-connection + data-default directory filepath hspec hspec-tmp-proc http-client + http-client-tls http-types mustache network random resourcet + temporary test-certs text tmp-proc unix vault wai wai-conduit warp + warp-tls + ]; + description = "WAI middleware that delegates handling of requests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -330814,36 +334845,36 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_3" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client + "warp_3_4_7" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, criterion, crypton-x509 + , directory, ghc-prim, hashable, hspec, hspec-discover, http-client , http-date, http-types, http2, iproute, network, process , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 + , time-manager, unix, vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.4.3"; - sha256 = "1g6g3bm8a4yjrd3h6r31ypf93r2as93d7cy17z6chwv8p41v0c86"; + version = "3.4.7"; + sha256 = "1s0kynqliqwn79gydrdxsgfdw6qffs5fmvhmxiydc379fxf07k7s"; libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers crypton-x509 ghc-prim hashable + http-date http-types http2 iproute network recv simple-sendfile stm + streaming-commons text time-manager unix vault wai word8 ]; testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers crypton-x509 directory ghc-prim + hashable hspec http-client http-date http-types http2 iproute + network process QuickCheck recv simple-sendfile stm + streaming-commons text time-manager unix vault wai word8 ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array auto-update base bytestring case-insensitive containers - crypton-x509 gauge ghc-prim hashable http-date http-types network - recv streaming-commons text time-manager unix unliftio vault wai + criterion crypton-x509 ghc-prim hashable http-date http-types + network recv streaming-commons text time-manager unix vault wai word8 ]; description = "A fast, light-weight web server for WAI applications"; @@ -330895,8 +334926,8 @@ self: { }: mkDerivation { pname = "warp-quic"; - version = "0.0.1"; - sha256 = "06q91zca4xndq6da5h43h6nh8m04akgksjs1avb2chscraqqnaj6"; + version = "0.0.2"; + sha256 = "1hb9xv5v7l1iwhv7qgm9y3prrjkpvcd5snmw6xc9wsk3fr82xl1r"; libraryHaskellDepends = [ base bytestring http3 network quic tls wai warp ]; @@ -330948,20 +334979,36 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, network - , recv, streaming-commons, tls, tls-session-manager, unliftio, wai - , warp + ({ mkDerivation, base, bytestring, data-default, network, recv + , streaming-commons, tls, tls-session-manager, unliftio, wai, warp }: mkDerivation { pname = "warp-tls"; - version = "3.4.7"; - sha256 = "0lc8abjqs7j52qnfsaljjngxxzxja6d3bk4q796ahcikk10id1cf"; + version = "3.4.9"; + sha256 = "01dpnc77sf7fkksvpi1rhfwk1h9lz5jjarzxjvy0y1yl8gn69vgf"; + libraryHaskellDepends = [ + base bytestring data-default network recv streaming-commons tls + tls-session-manager unliftio wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = lib.licenses.mit; + }) {}; + + "warp-tls_3_4_12" = callPackage + ({ mkDerivation, base, bytestring, network, recv, streaming-commons + , tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.4.12"; + sha256 = "09gx0fr5imvn7hcx55d2cgmia1di28mx8ckdvz487x0l7wkgbaqd"; libraryHaskellDepends = [ - base bytestring data-default-class network recv streaming-commons - tls tls-session-manager unliftio wai warp + base bytestring network recv streaming-commons tls + tls-session-manager wai warp ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -331101,7 +335148,6 @@ self: { ]; description = "Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {}; "waterfall-cad-examples" = callPackage @@ -331124,7 +335170,6 @@ self: { ]; description = "Examples for Waterfall CAD, a Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; mainProgram = "waterfall-cad-examples"; }) {}; @@ -331520,8 +335565,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.12.3.0"; - sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; + version = "0.13.0.0"; + sha256 = "04w49x4mknbsc86xq62amyfk3696cv906grhm98yyyg4gkpd7qx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331719,23 +335764,22 @@ self: { }) {}; "web-view" = callPackage - ({ mkDerivation, base, bytestring, casing, containers - , effectful-core, file-embed, http-types, string-interpolate - , sydtest, sydtest-discover, text + ({ mkDerivation, base, bytestring, casing, containers, Diff + , effectful-core, file-embed, html-entities, http-types, skeletest + , string-interpolate, text }: mkDerivation { pname = "web-view"; - version = "0.4.0"; - sha256 = "1dy9qpscj1r6g35n11qyk7fd4nkhbxp0ism8cqhgm2gwmhc2yn56"; + version = "0.6.1"; + sha256 = "08zqii0b566lrj8nn1cdndcdhppqb1gn5n0lgbv9vlj9b3glzyhc"; libraryHaskellDepends = [ base bytestring casing containers effectful-core file-embed - http-types string-interpolate text + html-entities http-types string-interpolate text ]; testHaskellDepends = [ - base bytestring casing containers effectful-core file-embed - http-types string-interpolate sydtest text + base bytestring casing containers Diff effectful-core file-embed + html-entities http-types skeletest string-interpolate text ]; - testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -332126,7 +336170,7 @@ self: { "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base - , base64-bytestring, bytestring, call-stack, data-default-class + , base64-bytestring, bytestring, call-stack, data-default , directory, directory-tree, exceptions, filepath, http-client , http-types, lifted-base, monad-control, network, network-uri , scientific, temporary, text, time, transformers @@ -332134,11 +336178,11 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.12.0.0"; - sha256 = "1z54i2ddcnrrfwgyy8bb3jqb279ssmwkyx69nc2zml0195ss5254"; + version = "0.12.0.1"; + sha256 = "17m4dmf1ljqpqnx2mcg92pil3i6679i3rc47x7b9gc6j36bww4l1"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base base64-bytestring bytestring - call-stack data-default-class directory directory-tree exceptions + call-stack data-default directory directory-tree exceptions filepath http-client http-types lifted-base monad-control network network-uri scientific temporary text time transformers transformers-base unordered-containers vector zip-archive @@ -332364,10 +336408,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.3.0"; - sha256 = "1d16dvb76rjnpbapzp2m8g04wijyh6xzi8pcf03ymbll78x438w6"; - revision = "1"; - editedCabalFile = "03wsg7mxqjhzpav4g0nmdkc17dclfi2rgx6lyykhsfzr54b7mznk"; + version = "1.3.1"; + sha256 = "1svspzqxqappvmbsvj1cvvvh7dbgsxww43xc93ny19x6qwmksgr5"; libraryHaskellDepends = [ arrows base binary bytestring case-insensitive cookie http-api-data http-media http-types jose network tagged template-haskell text wai @@ -332384,10 +336426,8 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.3.0"; - sha256 = "1278dkhrckz9m8qjmqjfc2bxgnq4wsmrnyjkf24ci5lvxvrz3y9f"; - revision = "1"; - editedCabalFile = "1p2zw502ggs5h2adxlb3ki8zphh9xs2vfp7ijdp1v545xl8q4740"; + version = "1.3.1"; + sha256 = "1aky9zdc040njndjch2l7xj8gb13ygnv0zgm2jc307lswnbh98vb"; libraryHaskellDepends = [ arrows base http-media http-types insert-ordered-containers lens mtl openapi3 text webgear-core @@ -332405,10 +336445,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.3.0"; - sha256 = "1s3iwzkb29g2zlkszarm27mlcwbszjwmmdzrb5ciqgz3l8pijyrx"; - revision = "1"; - editedCabalFile = "1g73hm9nmhv2432wdyg6j2kfxdk3dwwri4w7n98q3yx1f2pypv0g"; + version = "1.3.1"; + sha256 = "053ddbkjx9vshzrbyys7kjv92s97z0kjh586xgz5ix3zxpy6wyda"; libraryHaskellDepends = [ aeson arrows base base64-bytestring binary bytestring cookie http-api-data http-media http-types jose monad-time mtl resourcet @@ -332430,10 +336468,8 @@ self: { }: mkDerivation { pname = "webgear-swagger"; - version = "1.3.0"; - sha256 = "1p10wn5jgfyqcysa14sx6lmirc4irl1nls5mblav50yr9a5ilipc"; - revision = "1"; - editedCabalFile = "0svdzcxr3w3k48ipamzzgywrsbi21vdqi1yjbnlnmn6nwknkw0wq"; + version = "1.3.1"; + sha256 = "04z58rsn40zp19rr7b3bfp13n1yp4j2d5fjvm3msv7ik6pqgdkqq"; libraryHaskellDepends = [ arrows base http-types insert-ordered-containers lens mtl swagger2 text webgear-core @@ -332448,8 +336484,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.3.0"; - sha256 = "1vz7ycl2kppiwqp23z2dg6binc3azb8p5r17hir00zr4i8jhl88m"; + version = "1.3.1"; + sha256 = "07rc7wjjmgirwmbbi66gzbvbb194c2rb5ab2sw9kf3ppsl9xwqg0"; libraryHaskellDepends = [ base bytestring file-embed http-types text wai-app-static webgear-core @@ -332753,8 +336789,8 @@ self: { pname = "websockets"; version = "0.13.0.0"; sha256 = "1da95b71akggyikbxdmja3gcaqrz8sp6ri5jrsyavc2ickvi9y4s"; - revision = "2"; - editedCabalFile = "1wnj6c9vzgnmidxcy6jpv19b73qvnx4irxbqsncd688px7f7766m"; + revision = "4"; + editedCabalFile = "1g6f94cn20a4073cbinv2sfwglbqlpjxgzgj7svi6ff4vkfn0ins"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -333087,15 +337123,15 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, criterion-measurement, deepseq, ghc, mtl - , process, split, temporary + ({ mkDerivation, base, criterion-measurement, deepseq, mtl, process + , split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.17"; - sha256 = "1wp8r6mpj4cqy2mx7vxpav05qks2xj8y93rhzf9qhmvdr6r8acb2"; + version = "0.0.18"; + sha256 = "0bzix1dzq8ndhfxzpsm2sdjssdd0vzy7psj7gkg0rnvbcgf2w1nl"; libraryHaskellDepends = [ - base criterion-measurement deepseq ghc mtl process split temporary + base criterion-measurement deepseq mtl process split temporary ]; testHaskellDepends = [ base deepseq ]; description = "Measure allocations of a Haskell functions/values"; @@ -333419,6 +337455,8 @@ self: { pname = "wherefrom-compat"; version = "0.2.0.0"; sha256 = "0sy2kyp0sz0vkirlxvyc1s5szhx1f6a8zn0sysl2vbgk0yis3b0d"; + revision = "1"; + editedCabalFile = "1nz7qnhlcg2z8wm85ix1npj4aapdvdps77k1bbw6d5jk6i1rp18w"; libraryHaskellDepends = [ base ghc-heap ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A compatibility layer for GHC's 'wherefrom' function"; @@ -333565,8 +337603,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; - revision = "3"; - editedCabalFile = "01vy3civ7vzninmn6xdadfd9xfwn6hv002prpm9fb5i68qgbp8dr"; + revision = "4"; + editedCabalFile = "1nb1pcfm7kh59aqfj5344w0a96kjvc3zjww3702ff5gpxwabci8x"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -333642,38 +337680,43 @@ self: { }) {}; "wikimusic-api" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, contravariant-extras, directory, filepath - , free-alacarte, hasql, hasql-implicits, hasql-migration - , hasql-optparse-applicative, hasql-pool, hasql-transaction, hedis - , HTTP, keuringsdienst, keys, mime-mail, mtl, neat-interpolation - , openapi3, optics, optparse-applicative, password, password-types - , postgresql-libpq, relude, servant, servant-openapi3 - , servant-rate-limit, servant-server, smtp-mail, tasty, tasty-hunit - , text, time, tomland, uuid, vector, wai, wai-cors, wai-extra - , wai-rate-limit, wai-rate-limit-redis, warp, wikimusic-api-spec - , wikimusic-model-hs + ({ mkDerivation, aeson, async, base, base64-bytestring, beam-core + , beam-sqlite, bytestring, containers, contravariant-extras + , directory, filepath, free-alacarte, hspec, HTTP, http-client + , http-types, keuringsdienst, keys, mime-mail, mtl + , neat-interpolation, openapi3, optics, optparse-applicative + , password, password-types, prometheus-client + , prometheus-metrics-ghc, QuickCheck, random, relude, servant + , servant-openapi3, servant-server, smtp-mail, sqlite-simple, tasty + , tasty-hspec, text, time, tomland, uuid, wai, wai-cors, wai-extra + , wai-logger, wai-middleware-prometheus, warp, wikimusic-api-spec + , wikimusic-model-hs, word8, yggdrasil-schema }: mkDerivation { pname = "wikimusic-api"; - version = "1.1.0.1"; - sha256 = "11axz65b4zswca53q0scywl6qnbm6qpfy6dhzgi7n8s0d0518js5"; + version = "1.2.0.8"; + sha256 = "1xccl4d0c5p4rsv659hz23aaarzkjhx16jigz9nf2zjk6qs2g0lc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring containers - contravariant-extras directory filepath free-alacarte hasql - hasql-implicits hasql-migration hasql-optparse-applicative - hasql-pool hasql-transaction hedis HTTP keuringsdienst keys - mime-mail mtl neat-interpolation openapi3 optics - optparse-applicative password password-types postgresql-libpq - relude servant servant-openapi3 servant-rate-limit servant-server - smtp-mail text time tomland uuid vector wai wai-cors wai-extra - wai-rate-limit wai-rate-limit-redis warp wikimusic-api-spec - wikimusic-model-hs + aeson async base base64-bytestring beam-core beam-sqlite bytestring + containers contravariant-extras directory filepath free-alacarte + HTTP keuringsdienst keys mime-mail mtl neat-interpolation openapi3 + optics optparse-applicative password password-types + prometheus-client prometheus-metrics-ghc relude servant + servant-openapi3 servant-server smtp-mail sqlite-simple text time + tomland uuid wai wai-cors wai-extra wai-logger + wai-middleware-prometheus warp wikimusic-api-spec + wikimusic-model-hs word8 yggdrasil-schema ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ + base beam-core beam-sqlite containers directory hspec http-client + http-types keuringsdienst neat-interpolation optics password + password-types QuickCheck random relude sqlite-simple tasty + tasty-hspec text time uuid wai wai-logger wikimusic-api-spec + wikimusic-model-hs yggdrasil-schema + ]; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "wikimusic-api-exe"; @@ -333687,8 +337730,8 @@ self: { }: mkDerivation { pname = "wikimusic-api-spec"; - version = "1.2.1.2"; - sha256 = "12b44xwav5m4vkm8lvsza7p50dg05x9d062xcgswp14p9myb4g6i"; + version = "1.2.1.3"; + sha256 = "1636br87msqk7yc1pdi57s30h2xs9v7xrmlqq7alv4zx2hqqvv0c"; libraryHaskellDepends = [ aeson base bytestring directory filepath keys mtl openapi3 relude servant servant-openapi3 servant-rate-limit servant-server text @@ -333706,8 +337749,8 @@ self: { }: mkDerivation { pname = "wikimusic-model-hs"; - version = "1.2.0.0"; - sha256 = "1a1k7997yr8cz4p2x5z92ngxd7fxaxx8cqh0mldlv2cngiab9l08"; + version = "1.2.0.4"; + sha256 = "00vfs1ix8k5g4cpflnjk4nhb64lajvp8rpyzsdfjbmi2y1mj4ymy"; libraryHaskellDepends = [ aeson async base bytestring containers directory filepath keuringsdienst keys mtl neat-interpolation openapi3 optics password @@ -333718,28 +337761,32 @@ self: { "wikimusic-ssr" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring - , base64-bytestring, blaze-html, bytestring, containers, directory - , filepath, free-alacarte, HTTP, http-client, http-client-tls - , keuringsdienst, keys, mtl, neat-interpolation, optics - , optparse-applicative, relude, servant, servant-auth-server + , base64-bytestring, blaze-html, blaze-markup, bytestring + , containers, directory, filepath, free-alacarte, HTTP, http-client + , http-client-tls, keuringsdienst, keys, mtl, neat-interpolation + , optics, optparse-applicative, prometheus-client + , prometheus-metrics-ghc, relude, servant, servant-auth-server , servant-blaze, servant-client, servant-multipart, servant-server - , text, time, tomland, uuid, wai, wai-cors, wai-extra, warp - , wikimusic-api-spec, wikimusic-model-hs + , text, time, tomland, uuid, wai, wai-cors, wai-extra, wai-logger + , wai-middleware-prometheus, warp, wikimusic-api-spec + , wikimusic-model-hs }: mkDerivation { pname = "wikimusic-ssr"; - version = "0.6.0.1"; - sha256 = "0jd319qmr4x74zwa13hzkxhqicmjidhgny02nymqyscg6an3cv94"; + version = "1.0.1.6"; + sha256 = "0nhj6k7krc6d2lbknpi8r3yy5l9kkysj260mhavq2ksp1bw20hcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base16-bytestring base64-bytestring blaze-html - bytestring containers directory filepath free-alacarte HTTP - http-client http-client-tls keuringsdienst keys mtl - neat-interpolation optics optparse-applicative relude servant - servant-auth-server servant-blaze servant-client servant-multipart - servant-server text time tomland uuid wai wai-cors wai-extra warp - wikimusic-api-spec wikimusic-model-hs + blaze-markup bytestring containers directory filepath free-alacarte + HTTP http-client http-client-tls keuringsdienst keys mtl + neat-interpolation optics optparse-applicative prometheus-client + prometheus-metrics-ghc relude servant servant-auth-server + servant-blaze servant-client servant-multipart servant-server text + time tomland uuid wai wai-cors wai-extra wai-logger + wai-middleware-prometheus warp wikimusic-api-spec + wikimusic-model-hs ]; executableHaskellDepends = [ base relude ]; license = lib.licenses.gpl3Only; @@ -333973,8 +338020,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.4"; - sha256 = "1bgahm8jiwhcn3gq5z809c2mw5wkqpin6gwn9ppajn31ljahvk3f"; + version = "1.5"; + sha256 = "1bx4jirklv67i3zzjsz08drgf58xq01gpc0q80qkjy4q0hmqfv6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -334123,27 +338170,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.1.1"; - sha256 = "0zllz1wg2jpldjnyjkswrshs3agr8bbqnb6agv4avfgvffpj0rw1"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; - version = "1.2.2.0"; - sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; + version = "1.2.3.1"; + sha256 = "1fh6ds84ika43myhajv7c34d2mn34ms0qphd117ykwdxgp14fizb"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -334152,7 +338180,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -334233,17 +338260,16 @@ self: { }) {}; "withdependencies" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl - , profunctors + ({ mkDerivation, base, conduit, containers, hspec, mtl, profunctors }: mkDerivation { pname = "withdependencies"; - version = "0.3.0"; - sha256 = "1hjld3ndafnaxwx1c6s88dc3bimbc5vwfdf6lcsq22apzh1gmdm6"; + version = "0.3.1"; + sha256 = "0nqxws8r9a5x6ka22d4cfjxj54yfk82dpjyi8a0nnp2i0wpbxgyi"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; + testHaskellDepends = [ base conduit hspec mtl ]; description = "Run computations that depend on one or more elements in a stream"; license = lib.licenses.gpl3Only; }) {}; @@ -334336,6 +338362,18 @@ self: { license = lib.licenses.bsd2; }) {}; + "witness_0_7" = callPackage + ({ mkDerivation, base, constraints, containers, countable }: + mkDerivation { + pname = "witness"; + version = "0.7"; + sha256 = "1fqkxjhcnyghfh4ccamahr030c8r9vix6zd16s6h2p1f86cjn4hl"; + libraryHaskellDepends = [ base constraints containers countable ]; + description = "values that witness types"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "witty" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -334573,6 +338611,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) wlc;}; + "wled-json" = callPackage + ({ mkDerivation, aeson, barbies, base, bytestring, deriving-aeson + , hspec, hspec-discover, http-conduit, QuickCheck, rhine + }: + mkDerivation { + pname = "wled-json"; + version = "0.0.1.0"; + sha256 = "0pdin356y0zfs73dbf6c99lk556hmidrqvifk1xz80k8crd5qdkq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson barbies base bytestring deriving-aeson http-conduit + ]; + executableHaskellDepends = [ base rhine ]; + testHaskellDepends = [ aeson base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Convenient interface for interacting with WLED devices"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "wled-json-exe"; + broken = true; + }) {}; + "wobsurv" = callPackage ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring , hastache, HTF, http-client, http-types, HUnit, lifted-async @@ -335386,6 +339447,8 @@ self: { pname = "wraxml"; version = "0.5"; sha256 = "1zzslycz4hzg2l3pma0yfwdnqf08cw14b1ac5lzjm4z548bhzg0h"; + revision = "1"; + editedCabalFile = "0y0j420isc9cm1f2hl87fy33181w12cx0mn4m40ik8dld0npgbha"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -335509,6 +339572,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "wreq-effectful" = callPackage + ({ mkDerivation, base, bytestring, effectful-core, http-client + , wreq + }: + mkDerivation { + pname = "wreq-effectful"; + version = "0.1.0.1"; + sha256 = "1sxqvdc0h4y767blmznb4ld0bq25aanbnrwy2wvk23rm8c7vf0w9"; + revision = "1"; + editedCabalFile = "0dvrypqffj4cmy1qvygy9r6d6iwj3d9fka063bbkgm0ri3bsc40y"; + libraryHaskellDepends = [ + base bytestring effectful-core http-client wreq + ]; + testHaskellDepends = [ base ]; + description = "Adaptation of the wreq library for the effectful ecosystem"; + license = lib.licenses.mit; + }) {}; + "wreq-helper" = callPackage ({ mkDerivation, aeson, aeson-result, base, bytestring, http-client , text @@ -336139,6 +340220,23 @@ self: { license = lib.licenses.mit; }) {}; + "wuss_2_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, crypton-connection, data-default + , exceptions, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "2.0.2.2"; + sha256 = "0xrnd7n0nafjcgdvc1byfyibl4lp2z8xsxjnd1dq2vn8v8qpysz0"; + libraryHaskellDepends = [ + base bytestring crypton-connection data-default exceptions network + websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -336570,8 +340668,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.14.0"; - sha256 = "184ap6lpd29bx4b3dxpcpzc3za9m4gz2fwf7565mxlxlwjbyamhv"; + version = "0.15.0"; + sha256 = "15krqhh11s1ij87raiqz7inc0z9ir5vyqllh8zxki7v5l7s00gvg"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -336921,12 +341019,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "xhtml_3000_3_0_0" = callPackage + "xhtml_3000_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "xhtml"; - version = "3000.3.0.0"; - sha256 = "1rf8ksk65srdmlpqzpil8r527jzjxv0agx53apl85zik4nkdm0ly"; + version = "3000.4.0.0"; + sha256 = "1qald32plg2yh587hi2mvp66yryzw0lw6fm65hc1m09g2yf7vbg6"; libraryHaskellDepends = [ base bytestring containers text ]; description = "An XHTML combinator library"; license = lib.licenses.bsd3; @@ -337261,17 +341359,17 @@ self: { "xml-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, Cabal, cabal-doctest, conduit, conduit-extra - , containers, data-default-class, deepseq, doctest, hspec, HUnit + , containers, data-default, deepseq, doctest, hspec, HUnit , resourcet, text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.9.1.3"; - sha256 = "1x0vbxshka284xl07z5458v8r9i1ylr5iw8nqrmrw767caaidsfq"; + version = "1.9.1.4"; + sha256 = "0kfz8ddn1l20q41623dxjlmqjyn1i5pzj5a33pipml5z201hv6q4"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup bytestring conduit - conduit-extra containers data-default-class deepseq resourcet text + conduit-extra containers data-default deepseq resourcet text transformers xml-types ]; testHaskellDepends = [ @@ -337904,6 +342002,23 @@ self: { license = lib.licenses.mit; }) {}; + "xml-types-content" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, lawful-conversions + , QuickCheck, rerebase, text, xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-types-content"; + version = "0.0.1.1"; + sha256 = "0h713c91y24kwsy4d0pdk7ya53pdrc7shmwc6b6i29djlsph3xcj"; + libraryHaskellDepends = [ base text xml-types ]; + testHaskellDepends = [ + hspec lawful-conversions QuickCheck rerebase xml-conduit xml-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Utilities for dealing with Content-values of \"xml-types\""; + license = lib.licenses.mit; + }) {}; + "xml-verify" = callPackage ({ mkDerivation, base, bytestring, cryptostore, hxt, mtl, pem, x509 , xmlsec1 @@ -338936,6 +343051,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "xtea" = callPackage + ({ mkDerivation, base, binary, bytestring, hedgehog }: + mkDerivation { + pname = "xtea"; + version = "0.1.0.0"; + sha256 = "02h75vmww3jhij49acjbhh1bp0kknvxxvy4iiizf9rw97zsawr0j"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring hedgehog ]; + description = "XTEA (eXtended Tiny Encryption Algorithm)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "xtest" = callPackage ({ mkDerivation, base, libXtst, X11 }: mkDerivation { @@ -339026,6 +343155,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {libxxhash = null;}; + "xz" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, xz + }: + mkDerivation { + pname = "xz"; + version = "5.6.3"; + sha256 = "15450bmpbka14ykajr38aj8lyilg0vxsrhsdlq20a9zg63ppvc4d"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ xz ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "LZMA/XZ compression and decompression"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) xz;}; + + "xz-clib" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "xz-clib"; + version = "5.6.3"; + sha256 = "07pb33rjy0q8lyvz5bbmc7gwagpacn56ply2c92lcq527ixkdxfv"; + doHaddock = false; + description = "LZMA/XZ clibs"; + license = lib.licenses.bsd0; + }) {}; + "y0l0bot" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, network , old-locale, old-time, safe, split, text, time @@ -339598,6 +343755,30 @@ self: { broken = true; }) {}; + "yaml-marked" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , containers, dlist, hspec, hspec-expectations-json, libyaml + , markdown-unlit, mtl, resourcet, scientific, semigroupoids, text + , transformers, unliftio, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "yaml-marked"; + version = "0.2.0.1"; + sha256 = "0y263b1b8h95kxlzkc219k50x330lyhfcr0lx7rp7ddjp95459mm"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers dlist libyaml + mtl resourcet scientific text transformers unliftio + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-json markdown-unlit + semigroupoids text yaml + ]; + testToolDepends = [ markdown-unlit ]; + description = "Support for parsing and rendering YAML documents with marks"; + license = lib.licenses.mit; + }) {}; + "yaml-pretty-extras" = callPackage ({ mkDerivation, base, hspec, microlens-platform, rio, yaml }: mkDerivation { @@ -339909,8 +344090,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.11"; - sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; + version = "0.14.12"; + sha256 = "0izgyngkycrs0skmg6zisijhg9rp6gw7260pafrqvq6jakh3fawz"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -340980,7 +345161,7 @@ self: { license = lib.licenses.mit; }) {}; - "yesod-auth-oauth2_0_7_3_0" = callPackage + "yesod-auth-oauth2_0_7_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, crypton, errors, hoauth2 , hspec, http-client, http-conduit, http-types, memory, microlens , mtl, safe-exceptions, text, transformers, unliftio @@ -340988,8 +345169,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.3.0"; - sha256 = "162fr9lpcqgni6pm2d9y1a2frc234xipl5kllxkncwnnf748g234"; + version = "0.7.4.0"; + sha256 = "0s74q7scwkxc678b7j2i24c7cd3jkx34w3m0r6pbvsc0ifj2lm6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -341286,6 +345467,8 @@ self: { pname = "yesod-core"; version = "1.6.26.0"; sha256 = "0rsn09hsmg0wffy012fmxa0i9jz7p9j575mj946jphm663y8dh7b"; + revision = "1"; + editedCabalFile = "1zqaimbj3bx5idcaza7z7vmh5p0isyddapdd8wx114mldhb5v11q"; libraryHaskellDepends = [ aeson attoparsec-aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -341572,28 +345755,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , shakespeare, text, time, transformers, wai, xss-sanitize - , yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.7.6"; - sha256 = "1bskmz2d1nn192qirldrdfkhbqzjlq5wi7wlj8rcl4pnh5jxvqd8"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet shakespeare text time transformers - wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = lib.licenses.mit; - }) {}; - - "yesod-form_1_7_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -341613,7 +345774,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -342894,8 +347054,8 @@ self: { }: mkDerivation { pname = "yggdrasil-schema"; - version = "1.0.0.5"; - sha256 = "0d83cymxcx9n9fcaqybcfmv074zs0sgm7a99jzc1qp6kz2jqqjwy"; + version = "1.0.0.6"; + sha256 = "13ls2w3aib7alkkqg7s5g9p53ihkghpms3hiii10bh89qg20x1ci"; libraryHaskellDepends = [ aeson async base bytestring containers directory filepath keys mtl neat-interpolation optics optparse-applicative random relude @@ -342953,11 +347113,12 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.19.2"; - sha256 = "04ppydc16w6m0ldvpxq2xr313rwak18c4k4i1jsqlb8drcwfx7ch"; + version = "0.19.3"; + sha256 = "0lhrq34wjl58cxki3a2sbck620ak2zpkcxqbxqdffd4g2bjrpkdl"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim @@ -343190,15 +347351,15 @@ self: { "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers - , data-default, hashable, microlens-platform, oo-prototypes + , data-default, hashable, hspec, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec , tasty-quickcheck, template-haskell, transformers-base , unordered-containers }: mkDerivation { pname = "yi-language"; - version = "0.19.1"; - sha256 = "0vy0dsrgg3mg1v982v71rlyshsf64rzx25x667ybsk27sl7jp6r0"; + version = "0.19.2"; + sha256 = "050g61jjhby02shj12cdjsdz6z8cj3432k3qs1q2fi67pppfa5pn"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -343206,7 +347367,7 @@ self: { ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ - array base binary containers data-default hashable + array base binary containers data-default hashable hspec microlens-platform pointedlist regex-base regex-tdfa tasty tasty-hspec tasty-quickcheck template-haskell transformers-base unordered-containers @@ -343401,6 +347562,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; + "yield" = callPackage + ({ mkDerivation, base, containers, hspec, markdown-unlit, mtl + , transformers + }: + mkDerivation { + pname = "yield"; + version = "0.0.0.0"; + sha256 = "04lwfix9a7m9g15ns25mywfjzfzfgr5i7744gkyzgrkllh2mv0j8"; + libraryHaskellDepends = [ base containers mtl transformers ]; + testHaskellDepends = [ base hspec markdown-unlit mtl ]; + testToolDepends = [ markdown-unlit ]; + description = "YieldT monad transformer"; + license = lib.licenses.mit; + }) {}; + "yiyd" = callPackage ({ mkDerivation, base, bytestring, containers, hspec , hspec-discover, mtl, optparse-applicative, random, yaml @@ -343424,6 +347600,23 @@ self: { mainProgram = "yiyd"; }) {}; + "yj-sandbox" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "yj-sandbox"; + version = "0.1.0.0"; + sha256 = "1nb0aidix6fpk73wsj0fhnyslnh57w63bd10mw9x430sc1v7j2cb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base template-haskell ]; + executableHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "try hackage"; + license = lib.licenses.bsd3; + mainProgram = "yj-sandbox-exe"; + }) {}; + "yjftp" = callPackage ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure , mtl, process, unix @@ -344745,6 +348938,8 @@ self: { pname = "zip"; version = "2.1.0"; sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; + revision = "1"; + editedCabalFile = "1gm82c27fvgsincz0gi3c23w2lmlb5k3shnmncwdk6c3zyc4wjz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -345021,8 +349216,8 @@ self: { pname = "zlib"; version = "0.7.1.0"; sha256 = "1g2md8z0ijcbrqlx9q9i49myi2lnlvzmma1ajmsd5y0xp2v3ipbf"; - revision = "1"; - editedCabalFile = "03r5ib477af94l3i6mdhgkil6gzg9zh92vr4cgkwar9d16kcbqds"; + revision = "2"; + editedCabalFile = "01m2afpizlscn65v12vmcmmycs66a14xb8nsgrm5145lq1slmrl5"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 73b813c6b003a..ad542da643255 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 1e027408ef677..deb74210bdb7c 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 a1227d1774c94..473c05ea8383c 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/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 926841fe1dd09..a1db79c06a866 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 6f2f3def2b49c..a0ea85c83543f 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 327ce1100c883..30a454a25bea7 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 8416743b732ed..fb9437819e1ba 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 1da943ee81953..01d35a85d8730 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 6ef66937f7862..eb8c60e3eb275 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 2dfabd5ad6433..71c47c43089eb 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 18fdb6859e272..4e2c245dddced 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 27894b09b91ce..6f10476f10898 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 7eb508f27ae9e..a675633b503d3 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 24732a588525f..ef4ad0c3af4a8 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 50571a8f914d1..ee048867a278e 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 e1df48dd95bb8..3231bb6c649f6 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 45e640e2a708a..946b65d98a581 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 5ceaa28640861..a5129480ea13c 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 f28a856c4f50f..0762285843eb4 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/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index df8b97149d9c3..42002b52ccfca 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 8974839dca26a..e8612a9165320 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 3ecb8693e612c..f19b3d7b53df1 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 0d7ad1fcea8c1..f655b40193494 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 5ff8055cedee4..fcf8e65c4de52 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 bc8977c70882e..36e232ee0d0d5 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 3e7ee28dde4c5..5d2eb67c3a08a 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 a639f037641e0..8af33e8349246 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 7b4021b372010..61a502adffda8 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/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 0791a05e338e2..aeaa1919872f4 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 e60ebc9e1efef..0000000000000 --- 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 c300f8a0cd57c..8797c2962fbc1 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 0a48e4da85633..e05c1f65dd129 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 dec10c1b13ab8..a06d7994794f8 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 0e1c425cbad4a..e9ac9cc0d7e82 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 b4ed7cac7bec8..e558161385a6d 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 74984f5d3bd25..424dd1d608597 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 f4965979638e7..79d3af637194f 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 94df0a1a8e661..413368268aa20 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 44974bd228c8a..7925983f04463 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 2d858055693cc..39b8635e264de 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 7065eae8e631f..5290c15fee371 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 0000000000000..b8927159e70db --- /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 66bda00fe566f..e45fce5893651 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 2c10263bdc841..0000000000000 --- 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 0000000000000..364c3ed838e68 --- /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 6c74677b337ca..b49c286f9df07 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 d9da2026079c8..02e897b7efda0 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/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 80f70bb7669ae..9acf84229207d 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, pandoc_3_5 +, pandoc_3_6 , typst , esbuild , deno @@ -38,7 +38,7 @@ stdenv.mkDerivation (final: { preFixup = '' wrapProgram $out/bin/quarto \ --prefix QUARTO_DENO : ${lib.getExe deno} \ - --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_5} \ + --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_6} \ --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ --prefix QUARTO_TYPST : ${lib.getExe typst} \ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4502b3d9f8134..c483d5e3a2629 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 8381ec78a210d..29c6192fd7dea 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 73d37d55db936..d3a92589e474a 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 85bc5a64f0d81..11ffdc374d64a 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 57138294db31c..85b9d5fe4f929 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/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index a3efc646d3195..c9141b34a94d8 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/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 0000000000000..607d28c4bb5bd --- /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 f87bb2b9e177b..3c45dc3b4c5a4 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/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 1dd65e73ab4ba..6066eb50a1181 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 4acc351e7bd7c..a3ef7dd23b857 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 a8ecb02c3e786..d2184e8d2804e 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/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 5d8ae4defe57c..b9f1f9e1c72ac 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 57f8f5acdc91e..0ec07882d17e8 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/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index d3e71a5f9051b..7b041139a1718 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 5606662fd5716..72472a30b7cb7 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 8a1aa83541356..0000000000000 --- 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/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 86e604c0ce14a..01c25a4c2be60 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/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 89ff93e943094..93e4a7addef2a 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/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index a376fd413d47e..a3ed8ceea17ff 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 cef8cc71e918f..5bd8e9acf6808 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 f352096610cf2..ab09f5896b4a6 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/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 87a6302494462..1758da63ed202 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/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 9b1e0aebe73bd..1227553fc55e6 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/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 66ff5dc526ef6..1ee4ca70b6c68 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 4573011301ef9..0000000000000 --- 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/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index a41087b49d6eb..f817d78437d45 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/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 21a89983447e9..8bb31468b7491 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 f7cd8e7de47da..4267c72351270 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 9a4364a7436b3..21f6885428bf8 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/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index e36d8412ee204..f67bb186ab6f7 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 95156b9b9d9ad..7dd7b178fb43b 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/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 03463b006e6dc..419c62ea4cf44 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 a358ab4fe9141..1d53dc62587d9 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/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 19daf7262e188..00b147ab0e19f 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 584858a36bd31..769045aa104fc 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 a8cf00e51e604..cdf4f8dfa04dd 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/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index efada0d391d0f..e5a1bc9e443f0 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/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 32e4972e1add9..76252ba972694 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/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index e48cdcc0e8611..8a5517cd705ac 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 a7b5e70272676..5bfe04b9e5740 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 995f436a8242a..d9c5c674eb9e7 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/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index e1b2588f07fc4..dd31fc4536566 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/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 60eddaf3ba6ae..8ac8f71ecbdf8 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/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix index e7fbccced4485..a8bf7e2beb416 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 1831f5e163c24..edd4c041095e0 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/default.nix b/pkgs/development/python-modules/mypy/default.nix index 9acbfe21acc5d..780a3ce968ddc 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 c6cbdd69a33ad..f6780ba38981f 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/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index fad35559c9eda..5d72162865640 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 eb672a053f257..90f1fc68e3c0f 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/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 2469de129b325..f05df1c82144b 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/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 944dbabbe2ee7..4384c6ad2f27a 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/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 62dfdcb3918cb..8f66d7fe70dc1 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 66de9b48e848a..bbc43eecbcd84 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 ee79e250e1d72..0292027a607b9 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/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index d5cbf75a5c69f..1c1933537a00c 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/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 8dd0fb09c7405..a258462bf77ae 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 0000000000000..995b0d5f57dc5 --- /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 3f587808a0e99..e662589d96219 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 626f444db8839..b73c6bd05998e 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 fc4f140460196..a410c3345cde5 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/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh index 0eff690e9079e..88ccd0aac171b 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 751532baa6aa5..dbd2d5b20171f 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 9819e0d3ec7d2..8600ce998acc4 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-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 41b0ed328669f..e62f2e2ffa973 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/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index e47570dd9b06d..6f7ecf6b10b6b 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/re-assert/default.nix b/pkgs/development/python-modules/re-assert/default.nix index 5dc156b15053b..497908e994c23 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/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 3fab182d75f39..27ac5a2c32c2c 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 de6c7a29141fb..2626b10ff5ada 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/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index dc5b0433fa52e..c596ec3b40c61 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 51db7aaf0e195..4654e00b49194 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 f620568e1fa1f..565655c5678c6 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/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 18b2a0c43983c..29f50e5b4d921 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/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index dcd27bffb2bcd..956846ba82f16 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 81d9c74792be8..92039063cb8e4 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/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 472b5b882f8ac..69493dca3e5b0 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/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 06a0307ba731a..324401136cbbd 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 fb0ac0e1fd8ec..123ba62afdfd1 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 881be880d9d9f..5bfc3509d1741 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/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index fa744d03ede9e..a577eb617c0b3 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 351f1c6ff8e27..79a57455f7148 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/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index d2ba63827282c..0cd8813f694e2 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/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index f2e6f7f67409a..c2ceec7321172 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 e5fc56c2249b0..81cfedf6f6040 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 fc0ab09fd0a44..6a5da56092d83 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 e3a0f9609c0e2..66ccab402e2f3 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/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 463d485e242e7..242ca5c914f93 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -64,6 +64,6 @@ callPackage' ./hadrian.nix ( } // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c - Cabal = bootPkgs.Cabal_3_14_0_0; + Cabal = bootPkgs.Cabal_3_14_1_0; } ) diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index b08e7251e9e2b..9c6a90965f7f0 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 df07a2f6a5bfe..fb9b3f26b7eef 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 f575110b87fdb..53de05307568b 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 857cad5eabce4..fd10f7877a9df 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 ? { } - -# tests -, lunarvim +{ + 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, }: 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; }); - - grammars = - runCommand "grammars" { } ('' + fetchGrammar = ( + v: + fetchgit { + inherit (v) + url + rev + sha256 + fetchSubmodules + ; + } + ); + + 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 478ccb45ff9b7..0000000000000 --- 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 0000000000000..02b3d432a5e10 --- /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 00a7bdc6a01e5..6dd050841b0bc 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 01de2e761ea9f..837a0c8f05728 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 70e695cb1f051..c93bb562fe31c 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 2c4f996aa2a64..fece685a4fa43 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 2da784c93f183..2e4645af5590a 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 43cbaa2b8e712..f5048109cab79 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 f6d88446c6828..b41499b042eee 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/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 232d8569e4ce2..40280e6404f7f 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/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 0000000000000..09a64e1a3edd4 --- /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 0000000000000..5bc224eaa97ea --- /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 961b31d0720ad..12824de8472a7 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 842bc80461fd0..e8edcd6c87a20 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 9da5df30df53b..39cd09024fae4 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 a2ff458274e2d..0062dac44d872 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 15c7729919d40..69c23fca74a4e 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 f8f4e3e5978ec..15d2358da9902 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 1a9aba91c252c..34bf582b86edb 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 3a6b0ff004287..4e7915c733e19 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 3dd27c2cd2cd7..be3d5f852cec8 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 937f5a5a14ca1..134002567ecd0 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 0000000000000..65437d4cb5f23 --- /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 0000000000000..3b324aeca4ec8 --- /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 0000000000000..b3c38b7da9713 --- /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 6f3b95dc64183..722965fed1e14 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 1a98db7e02534..4c9e256a8dcbe 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 7e12ca5d96a95..57d3ab739cb69 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -41,7 +41,13 @@ 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 06a9f7322889a..fe6b1b8f0f98b 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 e04b6d8789930..85c5fb47191c9 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/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 522eb46087648..d5722bbbd6f4d 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 8c8adfb5e1249..db898b6317a8f 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 aa02aeb104577..558f54afadd8d 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 830464053a050..f24612acbca60 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 8c6906098b31a..7fbd2b0bc52d1 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 00f38b0a30426..8e5f554b512a5 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 1b17349f33d84..9d5ce46533e29 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 9dd9344a831f0..d242ff7c92878 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 6adbe5d6f68dc..d6a64437c2ace 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 68bb9914e40ec..23029da39f23c 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 46623e87e8c30..2657eb9089d1e 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 5c1684281b25f..c23b7315cde93 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 c60c5a4cbf9ba..44bd2263ddf0d 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 b73489f56b295..119dd75bc2c3b 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 fe0dca1863dd1..c670f076c34af 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 d7a11e3996cb5..bf9f028d6300f 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 24c74216b7293..20b4641ac0002 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 733e042ec0ddb..13578115a0141 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 b546c7eeb62ef..9e29c34efcd77 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 e17d281a61011..14ff6ca57d464 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 0fd274d7a5b78..fbaaed99cb61b 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 57ca20fdcbf77..41e836ca04eba 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 cc7106f9bb3d5..6c7a1aff4094e 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 7d941c33b9270..debcaab14e814 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 0000000000000..b4b9d9ee3e3d7 --- /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 eb06459a560da..a1b1575a51d28 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 184616844021d..59ecbb865ef9b 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 ] - ); - - 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 - ''; + ++ 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 + ''; - 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 - - # 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") - - # 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") - - # 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") - - # 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") - - # 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") - - # 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") - - - # Features - - # 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) - - # 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)) - - # FIDO2 - (lib.mesonEnable "libfido2" withFido2) - (lib.mesonEnable "openssl" (withHomed || withFido2 || withSysupdate)) - - # Password Quality - (lib.mesonEnable "pwquality" withPasswordQuality) - (lib.mesonEnable "passwdqc" false) - - # 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" 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.optionals (withShellCompletions == false) [ - (lib.mesonOption "bashcompletiondir" "no") - (lib.mesonOption "zshcompletiondir" "no") - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (lib.mesonBool "gshadow" false) - (lib.mesonBool "idn" false) - ]; + 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) + + (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") + + # 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") + + # 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) + + # Users + (lib.mesonOption "system-uid-max" "999") + (lib.mesonOption "system-gid-max" "999") + + # 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") + + # 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") + + # Features + + # 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) + + # 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)) + + # FIDO2 + (lib.mesonEnable "libfido2" withFido2) + (lib.mesonEnable "openssl" withOpenSSL) + + # Password Quality + (lib.mesonEnable "pwquality" withPasswordQuality) + (lib.mesonEnable "passwdqc" false) + + # 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.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) + ]; 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" ]; - - 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 - - # 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" - - 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 - ''; + 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 + + 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 + + # 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 + ''; # 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/home-assistant/custom-components/mass/package.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix new file mode 100644 index 0000000000000..eb9e6de01750c --- /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/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 82ae3d4ac21f6..6ef921211f7af 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)); - }; + 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" - ]; - }; + lib = { + disallowedReferences = [ + "out" + "dev" + "doc" + "man" + ]; + disallowedRequisites = [ + stdenv'.cc + llvmPackages.llvm.out + ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); + }; - man = { - disallowedReferences = [ - "out" - "dev" - "doc" - ]; - }; + doc = { + disallowedReferences = [ + "out" + "dev" + "man" + ]; }; + man = { + disallowedReferences = [ + "out" + "dev" + "doc" + ]; + }; + }; + strictDeps = true; buildInputs = diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 1ed163690f89e..99a753301d7ef 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 dbf5fef775767..83a61ee2529d8 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 9fa149ffe1e3e..95b47b5ed425f 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 @@ 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 8bc65ede79c06..0000000000000 --- 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 b55417b60af3a..79bb6a5e6a339 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 ]; + + 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) '' + 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 8e808e18edd32..a6c8395b0a568 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/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index f038b83ff7ad9..971fed1a61518 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 71cf601dfac04..c37e6a9868be7 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 dd8de4a23dbc4..687e6416ddc8e 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 bfef3df6b0e1f..5e930125f8755 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 9c18076872843..f49e07676f30d 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 dc8d14793b757..e3dbda8ca457b 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 fa8a07f695dd9..f812769a2a629 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1494,6 +1494,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 0a20ca33662ce..006bf25adfd1e 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 {}; @@ -4614,7 +4603,7 @@ with pkgs; pakcs = callPackage ../development/compilers/pakcs { }; - pandoc_3_5 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_5); }; + pandoc_3_6 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_6); }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -4701,9 +4690,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; @@ -5572,9 +5559,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xtreemfs = callPackage ../tools/filesystems/xtreemfs { - boost = boost179; - }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs { }; xorriso = libisoburn; @@ -8259,7 +8244,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 +8375,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; @@ -8570,6 +8553,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; + aws-spend-summary = haskellPackages.aws-spend-summary.bin; + backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { zig = buildPackages.zig_0_11; }; @@ -8595,7 +8580,7 @@ with pkgs; boost187 ; - boost = boost186; + boost = boost187; inherit (callPackages ../development/libraries/botan { }) botan2 @@ -9314,7 +9299,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; @@ -9578,7 +9568,12 @@ 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; @@ -10201,21 +10196,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 { }; @@ -10878,9 +10873,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; @@ -11103,17 +11095,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_9 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.9"; }; + sbcl_2_4_10 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_10 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "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_10; + sbcl = sbcl_2_4_11; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -12391,6 +12383,7 @@ with pkgs; withDocumentation = false; withEfi = false; withFido2 = false; + withGcrypt = false; withHostnamed = false; withHomed = false; withHwdb = false; @@ -12404,6 +12397,7 @@ with pkgs; withNetworkd = false; withNss = false; withOomd = false; + withOpenSSL = false; withPCRE2 = false; withPam = false; withPolkit = false; @@ -13412,6 +13406,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; @@ -15219,14 +15214,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 { }); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eac5f91a8b57e..bf1cd6aa18856 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -191,56 +191,6 @@ in llvmPackages = pkgs.llvmPackages_12; }; ghc92 = compiler.ghc928; - ghc945 = callPackage ../development/compilers/ghc/9.4.5.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc8107Binary; - inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 - python3 = buildPackages.python311; # so that we don't have two of them - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; - ghc946 = callPackage ../development/compilers/ghc/9.4.6.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc8107Binary; - inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 - python3 = buildPackages.python311; # so that we don't have two of them - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { bootPkgs = # Building with 9.2 is broken due to @@ -435,7 +385,7 @@ in buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc98 = compiler.ghc982; # HLS doesn't work yet with 9.8.3 + ghc98 = compiler.ghc984; ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -593,16 +543,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = packages.ghc928; - ghc945 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc945; - ghc = bh.compiler.ghc945; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; - ghc946 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc946; - ghc = bh.compiler.ghc946; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; ghc947 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc947; ghc = bh.compiler.ghc947; @@ -655,7 +595,7 @@ in ghc = bh.compiler.ghc984; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; - ghc98 = packages.ghc982; # HLS doesn't work yet with 9.8.3 + ghc98 = packages.ghc984; ghc9101 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9101; ghc = bh.compiler.ghc9101; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c4ac336dd39c5..7939e8df371cf 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 f25dce5a4dd22..452913121d443 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 76d7409d18073..02216dd7f80ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4867,7 +4867,7 @@ self: super: with self; { (pythonOlder "3.10") (toPythonModule (pkgs.fontforge.override { withPython = true; - inherit python; + python3 = python; })); fontmath = callPackage ../development/python-modules/fontmath { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 492a7503a03d6..ace9220040b28 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-haskell.nix b/pkgs/top-level/release-haskell.nix index 811af101d3712..919e9061a5187 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,8 +69,6 @@ let ghc926 ghc927 ghc928 - ghc945 - ghc946 ghc947 ghc948 ghc963 @@ -276,6 +274,7 @@ let agda alex arion + aws-spend-summary bench blucontrol cabal-install @@ -559,21 +558,14 @@ let compilerNames.ghc926 compilerNames.ghc927 compilerNames.ghc928 - compilerNames.ghc945 - compilerNames.ghc946 compilerNames.ghc947 compilerNames.ghc948 - compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal_3_14_0_0 = released; - cabal2nix = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc9101 - ] released; + Cabal_3_14_1_0 = released; + cabal2nix = released; + cabal2nix-unstable = released; funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 2.3.0.0 @@ -581,24 +573,18 @@ let # Support ceased as of 2.5.0.0 compilerNames.ghc902 ] released; - hoogle = lib.subtractLists [ - ] released; + hoogle = released; hlint = lib.subtractLists [ compilerNames.ghc902 compilerNames.ghc9101 + compilerNames.ghc9121 ] released; - hpack = lib.subtractLists [ - compilerNames.ghc9101 - ] released; + hpack = released; hsdns = released; jailbreak-cabal = released; - language-nix = lib.subtractLists [ - compilerNames.ghc9101 - ] released; + language-nix = released; nix-paths = released; - titlecase = lib.subtractLists [ - compilerNames.ghc9101 - ] released; + titlecase = released; ghc-api-compat = [ compilerNames.ghc8107 compilerNames.ghc902 @@ -606,32 +592,20 @@ let ghc-bignum = [ compilerNames.ghc8107 ]; - ghc-lib = lib.subtractLists [ - compilerNames.ghc9101 + ghc-lib = released; + ghc-lib-parser = released; + ghc-lib-parser-ex = released; + ghc-source-gen = lib.subtractLists [ + compilerNames.ghc9121 ] released; - ghc-lib-parser = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - ghc-lib-parser-ex = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - ghc-source-gen = [ - # Feel free to remove these as they break, - compilerNames.ghc8107 - compilerNames.ghc902 - compilerNames.ghc928 - ]; ghc-tags = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - hashable = lib.subtractLists [ - compilerNames.ghc9101 - ] released; - primitive = lib.subtractLists [ - compilerNames.ghc9101 + compilerNames.ghc9121 ] released; + hashable = released; + primitive = released; weeder = lib.subtractLists [ compilerNames.ghc9101 + compilerNames.ghc9121 ] released; }) { diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 32ca64052369a..b5c34fe6ba077 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 '';